summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-09-29 17:01:12 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-09-29 17:01:12 +0200
commit44bb7423ea89e0174fd33108bc1112677283114e (patch)
tree05d20b738ad00a5952a60c95732b3f883731461d
parentd74718143cd630e09ee14f5a2fb946b86266cb37 (diff)
downloadpython-apt-44bb7423ea89e0174fd33108bc1112677283114e.tar.gz
* po/*:
- make update-po
-rw-r--r--po/ar.po152
-rw-r--r--po/bg.po171
-rw-r--r--po/bn.po162
-rw-r--r--po/br.po152
-rw-r--r--po/ca.po172
-rw-r--r--po/cs.po171
-rw-r--r--po/da.po170
-rw-r--r--po/de.po172
-rw-r--r--po/el.po171
-rw-r--r--po/en_AU.po171
-rw-r--r--po/en_CA.po163
-rw-r--r--po/en_GB.po161
-rw-r--r--po/es.po171
-rw-r--r--po/fi.po173
-rw-r--r--po/fr.po171
-rw-r--r--po/fur.po152
-rw-r--r--po/gl.po156
-rw-r--r--po/he.po164
-rw-r--r--po/hi.po152
-rw-r--r--po/hr.po171
-rw-r--r--po/hu.po171
-rw-r--r--po/id.po171
-rw-r--r--po/it.po171
-rw-r--r--po/ja.po171
-rw-r--r--po/ka.po163
-rw-r--r--po/ko.po171
-rw-r--r--po/ku.po152
-rw-r--r--po/lt.po171
-rw-r--r--po/mk.po156
-rw-r--r--po/ms.po152
-rw-r--r--po/nb.po171
-rw-r--r--po/ne.po161
-rw-r--r--po/nl.po171
-rw-r--r--po/no.po161
-rw-r--r--po/oc.po160
-rw-r--r--po/pa.po163
-rw-r--r--po/pl.po171
-rw-r--r--po/pt.po171
-rw-r--r--po/pt_BR.po171
-rw-r--r--po/ro.po158
-rw-r--r--po/ru.po171
-rw-r--r--po/rw.po158
-rw-r--r--po/sk.po171
-rw-r--r--po/sr.po152
-rw-r--r--po/sv.po175
-rw-r--r--po/th.po171
-rw-r--r--po/tr.po152
-rw-r--r--po/uk.po164
-rw-r--r--po/update-manager.pot152
-rw-r--r--po/ur.po152
-rw-r--r--po/urd.po152
-rw-r--r--po/vi.po156
-rw-r--r--po/xh.po156
-rw-r--r--po/zh_CN.po171
-rw-r--r--po/zh_HK.po156
-rw-r--r--po/zh_TW.po171
56 files changed, 4802 insertions, 4383 deletions
diff --git a/po/ar.po b/po/ar.po
index e48a2e30..91ddd359 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,45 +88,45 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "خطاء في استيراد الملف"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "خطاء في ازالة المفتاح"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -134,11 +134,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "الرجاء ادخال اسم القرص"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "الرجاء ادخال القرص في الجهاز"
@@ -350,7 +350,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -547,7 +547,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr ""
@@ -771,14 +771,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -815,7 +815,7 @@ msgid "Backports"
msgstr ""
#: ../UpdateManager/UpdateManager.py:240
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
@@ -840,35 +840,13 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -876,62 +854,84 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
msgid "Checking for updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1058,73 +1058,77 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
-msgid "Authentication"
+msgid "Add Cdrom"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:10
-msgid "D_elete downloaded software files:"
+msgid "Authentication"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:11
-msgid "Download from:"
+msgid "D_elete downloaded software files:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:12
-msgid "Import the public key from a trusted software provider"
+msgid "Download from:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:13
-msgid "Internet Updates"
+msgid "Import the public key from a trusted software provider"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
msgid "Software Sources"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 35c2eb6b..ce1fc9bc 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,50 +88,50 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Обновления на софтуера"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "Изходен код"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "Изходен код"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Внасяне на ключ"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Грешка при внасяне на избрания файл"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "Избраният файл или не е GPG файл, или е повреден."
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Грешка при премахване на ключа"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Ключът, който сте избрали, не може да бъде премахнат. Докладвайте това като "
"грешка."
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -142,11 +142,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Моля, въведете име за диска"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Моля, поставете диск в устройството:"
@@ -400,7 +400,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -614,7 +614,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Системата Ви е актуална"
@@ -856,15 +856,15 @@ msgstr ""
"Идентификацията на надграждането е неуспешна. Възможно е да има проблем с "
"мрежата или сървъра. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Сваляне на файл %li от %li при %s/сек"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Сваляне на файл %li от %li при неизвестна скорост"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Сваляне на файл %li от %li при %s/сек"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -906,8 +906,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "_Инсталиране на актуализациите"
+msgid "Distribution updates"
+msgstr "_Поднови надграждането"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -934,75 +934,53 @@ msgstr ""
msgid "_Check All"
msgstr "_Проверка"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Размер за изтегляне: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Можете да инсталирате %s актуализация"
msgstr[1] "Можете да инсталирате %s актуализации"
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Моля, изчакайте! Това може да отнеме известно време."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "Актуализацията е завършена"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "_Инсталиране на актуализациите"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Нова версия: %s (Размер: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Версия %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "Вашата дистрибуция вече не се поддържа"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 "
@@ -1012,17 +990,17 @@ msgstr ""
"Надградете до по-късна версия на Ubuntu Linux. Вижте http://www.ubuntu.com "
"за повече информация за надграждането!"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr "Индексът на софтуера е повреден"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1032,6 +1010,28 @@ msgstr ""
"ползвайте диспечера на пакети \"Synaptic\" или първо задействайте \"sudo apt-"
"get install -f\" в терминален прозорец, за да поправите този проблем!"
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1174,27 +1174,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Добавяне на Cdrom"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Идентифициране"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "_Изтриване на изтеглените софтуерни файлове:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Свалянето е завършено"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Внасяне на публичния ключ от доверен доставчик на софтуер"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Актуализации по Интернет"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1202,52 +1207,52 @@ msgstr ""
"Само актуализации на сигурността от официалните сървъри на Ubuntu ще бъдат "
"инсталирани автоматично"
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "Връщане на _стандартните стойности"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Връщане на стандартните ключове на Вашата дистрибуция"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Настройки на софтуера"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "Изходен код"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_Проверявай за актуализации автоматично:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "И_зтегли актуализациите във фонов режим, но не ги инсталирай"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
#, fuzzy
msgid "_Import Key File"
msgstr "Внасяне на ключ"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "_Инсталирай актуализациите на сигурноста без потвърждение"
@@ -1642,6 +1647,13 @@ msgstr "DFSG-съвместим софтуер с несвободни зави
msgid "Non-DFSG-compatible Software"
msgstr "Софтуер несъвместим с DFSG"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Сваляне на файл %li от %li при неизвестна скорост"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "_Инсталиране на актуализациите"
+
#~ msgid "Cancel _Download"
#~ msgstr "Отмяна на _изтеглянето"
@@ -1728,9 +1740,6 @@ msgstr "Софтуер несъвместим с DFSG"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Ключове</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Добавяне на Cdrom"
-
#~ msgid "Installation Media"
#~ msgstr "Носител на инсталацията"
diff --git a/po/bn.po b/po/bn.po
index 105eaf69..a3a8211b 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,46 +88,46 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "সফ্টওয়্যার আপডেট"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "কী ইম্পোর্ট"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "নির্বাচিত ফাইলটি ইম্পোর্ট করতে সমস্যা হয়েছে"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "বেছে নেয়া ফাইলটি মনে হয় কোন GPG কী ফাইল নয় অথবা এটি নষ্ট।"
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "কী সরাতে সমস্যা হয়েছে"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -138,11 +138,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "ডিস্কের জন্য একটি নাম দিন"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "অনুগ্রহ করে ড্রাইভে একটি ডিস্ক দিন:"
@@ -368,7 +368,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -566,7 +566,7 @@ msgstr "তথ্য হারাতে না চাইলে সকল অ্
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "আপনার সিস্টেম আপ-টু-ডেট"
@@ -794,14 +794,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -844,8 +844,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "আপডেট ইন্সটল করো (_I)"
+msgid "Distribution updates"
+msgstr "পুনরায় আপগ্রেড শুরু (_R)"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -872,98 +872,98 @@ msgstr ""
msgid "_Check All"
msgstr "পরীক্ষা করো (_C)"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "ডাউনলোড এর আকার: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "আপনি %s আপডেট ইনস্টল করতে পারেন"
msgstr[1] "আপনি %s আপডেট ইনস্টল করতে পারেন"
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "অনুগ্রহ করে অপেক্ষা করুন, এটি কিছুটা সময় নিতে পারে।"
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "আপডেট সম্পন্ন"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "আপডেট ইন্সটল করো (_I)"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "নতুন ভার্সন: %s (আকার: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "ভার্সন %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "আপনার ডিস্ট্রিবিউশনটি আর সমর্থিত নয়"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr "সফ্টওয়্যার ইন্ডেক্সটি নস্ট"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1099,76 +1099,81 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "সিডিরম যোগ (_C)"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "প্রমাণীকরন"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "ডাউনলোড করা সফ্টওয়্যার ফাইল মুছো (_e):"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "ডাউনলোড সম্পন্ন"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "বিশ্বস্ত সফ্টওয়্যার প্রদানকারীর থেকে পাবলিক কী ইমপোর্ট করো"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "ইন্টারনেট আপডেট"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "ডিফল্ট পুনঃস্হাপন (_D)"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "আপনার ডিস্ট্রিবিউশনের ডিফল্ট কী পুনঃস্হাপন করুন"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "সফ্টওয়্যার বৈশিষ্ট্য"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "স্বয়ংক্রিয় ভাবে আপডেট পরীক্ষা করো (_C):"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "আড়ালে আপডেট ডাউনলোড করো, কিন্তু তাদেরকে ইন্সটল করো না (_D)"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "কী ফাইল ইম্পোর্ট(_ই)"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "নিরাপত্তা জনিত আপডেট গুলো অনুমদন ছাড়াই ইন্সটল করো (_I)"
@@ -1534,6 +1539,10 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "আপডেট ইন্সটল করো (_I)"
+
#~ msgid "Cancel _Download"
#~ msgstr "ডাউনলোড বাতিল (_D)"
@@ -1604,9 +1613,6 @@ msgstr ""
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>কী</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "সিডিরম যোগ (_C)"
-
#~ msgid "Installation Media"
#~ msgstr "ইন্সটলেশন মাধ্যম"
diff --git a/po/br.po b/po/br.po
index 95cfc8b1..d933750b 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,49 +88,49 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Emborzhiañ an alc'hwezh"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Fazi en ur emborzhiañ ar restr dibabet"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Fazi en ur zilemel an alc'hwezh"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -138,11 +138,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Roit un anv evit ar bladenn marplij"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Lakait ur bladenn e-barzh ul lenner marplij:"
@@ -354,7 +354,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -548,7 +548,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr ""
@@ -772,14 +772,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -816,7 +816,7 @@ msgid "Backports"
msgstr ""
#: ../UpdateManager/UpdateManager.py:240
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
@@ -841,97 +841,97 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
msgid "Checking for updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1058,74 +1058,78 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
-msgid "Authentication"
+msgid "Add Cdrom"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:10
-msgid "D_elete downloaded software files:"
+msgid "Authentication"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:11
-msgid "Download from:"
+msgid "D_elete downloaded software files:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:12
-msgid "Import the public key from a trusted software provider"
+msgid "Download from:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:13
-msgid "Internet Updates"
+msgid "Import the public key from a trusted software provider"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
msgid "Software Sources"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
#, fuzzy
msgid "_Import Key File"
msgstr "Emborzhiañ an alc'hwezh"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 7ca16052..c29de9b3 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -87,52 +87,52 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Actualitzacions de programari"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "Font"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "Font"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Importa un clau"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "S'ha produït un error en importar el fitxer seleccionat"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "S'ha produït un error en esborrar la clau"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -143,11 +143,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Introduïu un nom per al disc"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Inseriu un disc a la unitat:"
@@ -395,7 +395,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Aquests paquets instal·lats ja no es mantindran de manera oficial i només "
@@ -601,7 +601,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "El vostre sistema està actualitzat"
@@ -833,15 +833,15 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "S'està descarregant el fitxer %li de %li amb %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "S'està descarregant el fitxer %li de %li a una velocitat desconeguda"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "S'està descarregant el fitxer %li de %li amb %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -883,8 +883,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "_Instal·la les actualitzacions"
+msgid "Distribution updates"
+msgstr "_Reprén l'actualització"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -911,75 +911,53 @@ msgstr ""
msgid "_Check All"
msgstr "_Comprova"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Mida de la descàrrega: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Espereu, això pot tardar una estona."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "S'ha completat l'actualització"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "S'estan comprovant les actualitzacions..."
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Versió nova: %s (Mida: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versió %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "La vostra distribució ja no es mantindrà més"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 +967,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:845
#, 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:880
msgid "Software index is broken"
msgstr "L'índex de programari s'ha trencat"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1009,6 +987,28 @@ msgstr ""
"utilitzeu el gestor de paquets \"Synaptic\" o executeu \"sudo apt-get "
"install -f\" en un terminal."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1152,77 +1152,82 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Afegeix un _CD-ROM"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Autenticació"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "Esborra els fitxers de programari descarregats:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "S'ha completat la descàrrega"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Importa la clau pública d'un proveïdor de confiança"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Actualitzacions d'Internet"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "Restaura els valors per _defecte"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Restaura les claus per defecte de la vostra distribució"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Propietats del programari"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "Font"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_Comprova les actualitzacions automàticament"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "_Descarrega les actualitzacions en segon pla, però no les instal·lis"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "_Importa una clau"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "_Instal·la actualitzacions de seguretat sense confirmació"
@@ -1611,6 +1616,14 @@ msgstr "Programari compatible DFSG amb dependències no lliures"
msgid "Non-DFSG-compatible Software"
msgstr "Programari no compatible DFSG"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr ""
+#~ "S'està descarregant el fitxer %li de %li a una velocitat desconeguda"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "_Instal·la les actualitzacions"
+
#~ msgid "Cancel _Download"
#~ msgstr "Cancel·la la _descàrrega"
@@ -1702,9 +1715,6 @@ msgstr "Programari no compatible DFSG"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Claus</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Afegeix un _CD-ROM"
-
#~ msgid "Installation Media"
#~ msgstr "Mitjà d'instal·lació"
diff --git a/po/cs.po b/po/cs.po
index 1573653f..4554f451 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -89,46 +89,46 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Aktualizace softwaru"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Importovat klíč"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Chyba při importování vybraného souboru"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Chyba při odstraňování klíče"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -139,11 +139,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Prosím zadejte jméno disku"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Prosím vložte disk do mechaniky:"
@@ -380,7 +380,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -588,7 +588,7 @@ msgstr "Pro zamezení ztráty dat, uzavřete všechny aplikace a dokumenty."
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Váš systém je aktuální"
@@ -828,15 +828,15 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Stahuji %li. soubor z %li rychlostí %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Stahuji %li. soubor z %li neznámou rychlostí"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Stahuji %li. soubor z %li rychlostí %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -877,8 +877,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "Instaluji aktualizace"
+msgid "Distribution updates"
+msgstr "_Pokračovat v upgradu"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -905,35 +905,13 @@ msgstr ""
msgid "_Check All"
msgstr "_Zkontrolovat"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Stahovaná velikost: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -941,40 +919,40 @@ msgstr[0] "Můžete instalovat %s aktualizaci"
msgstr[1] "Můžete instalovat %s aktualizace"
msgstr[2] "Můžete instalovat %s aktualizací"
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Prosím čekejte, může to nějakou dobu trvat."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "Aktualizace je dokončena"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Zkontrolovat dostupné aktualizace"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Nová verze: %s (Velikost: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Verze %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "Vaše distribude už není podporovaná"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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,23 +962,45 @@ 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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1143,27 +1143,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Přidat _Cdrom"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Ověření"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "_Smazat stažené soubory programů:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Stahování bylo dokončeno"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Importovat veřejný klíč od důvěryhodného poskytovate softwaru"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Síťové aktualizace"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1171,51 +1176,51 @@ msgstr ""
"Automaticky instalovány budou pouze bezpečností aktualizace z oficiálních "
"serverů Ubuntu."
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "Obnovit _Původní"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Obnovit původní klíče vaší distribuce"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Vlastnosti softwaru"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_Zkontrolovat aktualizace automaticky"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "_Stáhnout aktualizace na pozadí, ale neinstalovat je."
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
#, fuzzy
msgid "_Import Key File"
msgstr "Importovat klíč"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "_Instalovat bezpečnostní aktualizace bez potvrzení"
@@ -1603,6 +1608,13 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr "Žádný DFSG kompatibilní Software"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Stahuji %li. soubor z %li neznámou rychlostí"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Instaluji aktualizace"
+
#~ msgid "Cancel _Download"
#~ msgstr "Přerušit _stahování"
@@ -1680,9 +1692,6 @@ msgstr "Žádný DFSG kompatibilní Software"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Klíče</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Přidat _Cdrom"
-
#~ msgid "Installation Media"
#~ msgstr "Instalační Medium"
diff --git a/po/da.po b/po/da.po
index 6daada0e..9f8e8041 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,47 +88,47 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Opdateringer"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Importér nøgle"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Fejl under importering af den valgte fil"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Fejl ved fjernelse af nøgle"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -139,11 +139,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Indtast venligst et navn til disken"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Indsæt venligst en disk i drevet:"
@@ -388,7 +388,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Disse installerede pakker er ikke længere officielt understøttet, og er nu "
@@ -600,7 +600,7 @@ msgstr "Luk alle åbne programmer og dokumenter for at undgå tab af data."
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Dit system er opdateret"
@@ -842,15 +842,15 @@ msgstr ""
"Godkendelse af opgraderingen fejlede. Der er muligvis et problem med "
"netværket eller med serveren. "
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, fuzzy, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Henter fil %li af %li med %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Henter fil %li af %li med ukendt hastighed"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Henter fil %li af %li med %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -893,8 +893,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "_Installer Opdateringer"
+msgid "Distribution updates"
+msgstr "_Genoptag opgradering"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -921,75 +921,53 @@ msgstr ""
msgid "_Check All"
msgstr "_Tjek"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Overføringsstørelse: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Vent venligst, dette kan tage et stykke tid."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "Opdatering udført"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "_Installer Opdateringer"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Ny version: %s (Size: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Version %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "Din distribution understøtes ikke længere"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 +977,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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr "Software indexet er i stykker"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1019,6 +997,28 @@ msgstr ""
"pakkehåndteringsprogrammet \"Synaptic\" eller kør \"sudo apt-get install -f"
"\" i en terminal for at ordne dette problem først."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1165,29 +1165,34 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Tilføj _CD-ROM"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Godkendelse"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
#, fuzzy
msgid "D_elete downloaded software files:"
msgstr "_Slet overførte softwarefiler:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Overførsel fuldført"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
#, fuzzy
msgid "Import the public key from a trusted software provider"
msgstr "Importer den offentlige nøgle fra en betroet softwareleverandør"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Internetopdateringer"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1195,51 +1200,51 @@ msgstr ""
"Kun sikkerhedsopdateringer fra de officielle Ubuntu-servere vil blive "
"installeret automatisk."
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "Gendan _standard"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Gendan standardnøglerne for din distribution"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Softwareinstillinger"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_Kontroller automatisk om der er nye opdateringer"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "_Hent opdateringer i baggrunden, men installer dem ikke"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
#, fuzzy
msgid "_Import Key File"
msgstr "Importér nøgle"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "_Installer sikkerhedsopdateringer automatisk uden bekræftelse"
@@ -1633,6 +1638,13 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Henter fil %li af %li med ukendt hastighed"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "_Installer Opdateringer"
+
#, fuzzy
#~ msgid "Cancel _Download"
#~ msgstr "Afbryd _Hentning"
@@ -1715,10 +1727,6 @@ msgstr ""
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Nøgler</b>"
-#, fuzzy
-#~ msgid "Add _Cdrom"
-#~ msgstr "Tilføj _CD-ROM"
-
#~ msgid "Installation Media"
#~ msgstr "Installationsmedie"
diff --git a/po/de.po b/po/de.po
index aec66084..6dd01bb6 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -89,52 +89,52 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Software-Aktualisierungen"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "Quellen"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "Quellen"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Schlüssel importieren"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Fehler beim Importieren der gewählten Datei"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Fehler beim Entfernen des Schlüssels"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -145,11 +145,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Geben Sie einen Namen für das Medium ein"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Bitte legen Sie ein Medium in das Laufwerk:"
@@ -412,7 +412,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Die installierten Pakete werden nicht mehr länger offiziell unterstützt und "
@@ -631,7 +631,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Ihr System ist auf dem aktuellen Stand"
@@ -876,15 +876,15 @@ msgstr ""
"Die Echtheitsbestätigung der Aktualisierung ist fehlgeschlagen. "
"Möglicherweise gibt es Probleme im Netzwerk oder am Server. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Datei %li von %li wird mit %s/s heruntergeladen"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Datei %li von %li wird mit unbekannter Geschwindigkeit heruntergeladen"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Datei %li von %li wird mit %s/s heruntergeladen"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -930,8 +930,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "Aktualisierungen werden installiert"
+msgid "Distribution updates"
+msgstr "_Aktualisierung fortsetzen"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -958,75 +958,53 @@ msgstr ""
msgid "_Check All"
msgstr "_Prüfen"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Download-Größe: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Bitte warten Sie, dieser Vorgang kann etwas Zeit in Anspruch nehmen."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "Aktualisierung ist abgeschlossen"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Nach verfügbaren Aktualisierungen suchen"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Neue Version: %s (Größe: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Version %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "Ihre Distribution wird nicht länger unterstützt"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 "
@@ -1037,17 +1015,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:845
#, 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:880
msgid "Software index is broken"
msgstr "Der Software-Index ist beschädigt"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1057,6 +1035,28 @@ msgstr ""
"verwenden Sie zuerst die Synaptic Paketverwaltung oder führen Sie »sudo apt-"
"get install -f« im Terminal aus, um dieses Problem zu beheben."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1200,29 +1200,34 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "CD-Rom _hinzufügen"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Echtheitsbestätigung"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "Heruntergeladene Paketdateien _löschen:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Herunterladen abgeschlossen"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr ""
"Den öffentlichen Schlüssel eines vertrauenswürdigen Software-Anbieters "
"importieren"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Internet-Aktualisierungen"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1230,52 +1235,52 @@ msgstr ""
"Nur Sicherheitsaktualisierungen von den offiziellen Ubuntu-Servern werden "
"automatisch installiert"
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "_Vorgabeschlüssel wiederherstellen"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Die Vorgabeschlüssel Ihrer Distribution wiederherstellen"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Software-Eigenschaften"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "Quellen"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_Automatisch auf Aktualisierungen prüfen:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr ""
"Aktualisierungen im _Hintergrund herunterladen, aber nicht installieren"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "Schlüsseldatei _importieren"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "Sicherheitsaktualisierungen _ohne Bestätigung installieren"
@@ -1669,6 +1674,14 @@ msgstr "DFSG-kompatible Software mit unfreien Abhängigkeiten"
msgid "Non-DFSG-compatible Software"
msgstr "Nicht DFSG-kompatible Software"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr ""
+#~ "Datei %li von %li wird mit unbekannter Geschwindigkeit heruntergeladen"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Aktualisierungen werden installiert"
+
#~ msgid "Cancel _Download"
#~ msgstr "_Herunterladen abbrechen"
@@ -1763,9 +1776,6 @@ msgstr "Nicht DFSG-kompatible Software"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Schlüssel</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "CD-Rom _hinzufügen"
-
#~ msgid "Installation Media"
#~ msgstr "Installationsmedien"
diff --git a/po/el.po b/po/el.po
index 3a807b4d..779ef170 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -87,49 +87,49 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
msgid "Software Channel"
msgstr "Κανάλι λογισμικού"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr "Ενεργό"
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Εισαγωγή κλειδιού"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Σφάλμα εισαγωγής επιλεγμένου αρχείου"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"Το επιλεγμένο αρχείο μπορεί να μην είναι ένα αρχείο κλειδιού GPG ή μπορεί να "
"είναι κατεστραμμένο."
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Σφάλμα απομάκρυνσης του κλειδιού"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Το επιλεγμένο κλειδί δεν μπορεί να απομακρυνθεί. Παρακαλώ αναφέρετε το ως "
"σφάλμα."
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -140,11 +140,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Παρακαλώ εισάγετε ένα όνομα για το δίσκο"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Παρακαλώ εισάγετε ένα δίσκο στον οδηγό:"
@@ -404,7 +404,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Αυτά τα εγκατεστημένα πακέτα δεν υποστηρίζονται πια επίσημα, και τώρα "
@@ -622,7 +622,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Το σύστημα σας είναι ενημερωμένο"
@@ -863,15 +863,15 @@ msgstr ""
"Η πιστοποίηση της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα δικτύου ή "
"εξυπηρετητή. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Λήψη αρχείου %li από %li με %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Λήψη αρχείου %li από %li με άγνωστη ταχύτητα"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Λήψη αρχείου %li από %li με %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -915,8 +915,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "Εγκατάσταση ενημερώσεων"
+msgid "Distribution updates"
+msgstr "_Συνέχεια αναβάθμισης"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -943,75 +943,53 @@ msgstr ""
msgid "_Check All"
msgstr "Έλε_γχος"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Μέγεθος λήψης: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Μπορείτε να εγκαταστήσετε %s ενημέρωση"
msgstr[1] "Μπορείτε να εγκαταστήσετε %s ενημερώσεις"
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Παρακαλώ περιμένετε, αυτό μπορεί να διαρκέσει λίγο χρόνο."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "Η ενημέρωση ολοκληρώθηκε"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Έλεγχος για διαθέσιμες ενημερώσεις"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Νέα έκδοση: %s (Μέγεθος: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Έκδοση%s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "Η διανομή σας δεν υποστηρίζεται πια"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 +1000,17 @@ msgstr ""
"Ubuntu Linux. Δείτε το http://www.ubuntu.com για περισσότερες πληροφορίες "
"για την αναβάθμιση."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:845
#, 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:880
msgid "Software index is broken"
msgstr "Ο κατάλογος λογισμικού είναι κατεστραμμένος"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1042,6 +1020,28 @@ msgstr ""
"το διαχειριστή πακέτων \"Synaptic\" η εκτελέστε την εντολή \"sudo apt-get "
"install -f\" σε ένα τερματικό για να διορθώσετε το πρόβλημα πρώτα."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1185,27 +1185,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Προσθήκη _Cdrom"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Πιστοποίηση"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "Δια_γραφή αρχείων ληφθέντων πακέτων"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Η λήψη ολοκληρώθηκε"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Εισαγωγή του δημόσιου κλειδιού από έναν έμπιστο πάροχο λογισμικού"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Αναβαθμίσεις διαδικτύου"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1213,50 +1218,50 @@ msgstr ""
"Μόνο οι ενημερώσεις ασφαλείας που προέρχονται από τους επίσημους "
"εξυπηρετητές του Ubuntu θα εγκαθίστανται αυτόματα."
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "Επαναφορά π_ροεπιλογών"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Επαναφορά των προεπιλεγμένων κλειδιών της διανομής σας"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Ιδιότητες λογισμικού"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "Αυτόματος έλεγ_χος για ενημερώσεις κάθε:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "Λή_ψη ενημερώσεων στο παρασκήνιο χωρίς να εγκατασταθούν"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "Ε_ισαγωγή αρχείου κλειδιού"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "Ε_γκατάσταση ενημερώσεων ασφαλείας χωρίς επιβεβαίωση"
@@ -1647,6 +1652,13 @@ msgstr "Λογισμικό συμβατό με DFSG με μη Ελεύθερες
msgid "Non-DFSG-compatible Software"
msgstr "Λογισμικό μη συμβατό με DFSG"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Λήψη αρχείου %li από %li με άγνωστη ταχύτητα"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Εγκατάσταση ενημερώσεων"
+
#~ msgid "Cancel _Download"
#~ msgstr "Ακύρωση _λήψης αρχείων"
@@ -1737,9 +1749,6 @@ msgstr "Λογισμικό μη συμβατό με DFSG"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Κλειδιά</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Προσθήκη _Cdrom"
-
#~ msgid "Installation Media"
#~ msgstr "Μέσα εγκατάστασης"
diff --git a/po/en_AU.po b/po/en_AU.po
index b38dcc80..efcc4b91 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,47 +88,47 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Software Updates"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Import key"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Error importing selected file"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Error removing the key"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -139,11 +139,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Please enter a name for the disc"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Please insert a disc in the drive:"
@@ -400,7 +400,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"These installed packages are no longer officially supported, and are now "
@@ -615,7 +615,7 @@ msgstr "To prevent data loss close all open applications and documents."
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Your system is up-to-date"
@@ -854,15 +854,15 @@ msgstr ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Downloading file %li of %li with %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Downloading file %li of %li with unknown speed"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Downloading file %li of %li with %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -904,8 +904,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "_Install Updates"
+msgid "Distribution updates"
+msgstr "_Resume Upgrade"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -932,75 +932,53 @@ msgstr ""
msgid "_Check All"
msgstr "_Check"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Download size: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Please wait, this can take some time."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "Update is complete"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "_Install Updates"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "New version: %s (Size: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Version %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "Your distribution is not supported anymore"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 "
@@ -1010,17 +988,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:845
#, 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:880
msgid "Software index is broken"
msgstr "Software index is broken"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1030,6 +1008,28 @@ msgstr ""
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
"this issue at first."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1173,27 +1173,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Add _Cdrom"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Authentication"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "D_elete downloaded software files:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Download is complete"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Import the public key from a trusted software provider"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Internet Updates"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1201,50 +1206,50 @@ msgstr ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "Restore _Defaults"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Restore the default keys of your distribution"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Software Properties"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_Check for updates automatically:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "_Download updates in the background, but do not install them"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "_Import Key File"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "_Install security updates without confirmation"
@@ -1637,6 +1642,13 @@ msgstr "DFSG-compatible Software with Non-Free Dependencies"
msgid "Non-DFSG-compatible Software"
msgstr "Non-DFSG-compatible Software"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Downloading file %li of %li with unknown speed"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "_Install Updates"
+
#~ msgid "Cancel _Download"
#~ msgstr "Cancel _Download"
@@ -1727,9 +1739,6 @@ msgstr "Non-DFSG-compatible Software"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Keys</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Add _Cdrom"
-
#~ msgid "Installation Media"
#~ msgstr "Installation Media"
diff --git a/po/en_CA.po b/po/en_CA.po
index 960ba35b..86bc663c 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -89,49 +89,49 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Software Updates"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "Source"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "Source"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Error importing selected file"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Error removing the key"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -139,11 +139,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -360,7 +360,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -557,7 +557,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
#, fuzzy
msgid "Your system is up-to-date"
msgstr "Your system is up-to-date!"
@@ -789,14 +789,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -840,8 +840,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "_Install"
+msgid "Distribution updates"
+msgstr "Upgrade finished"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -867,99 +867,99 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "_Install"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Version %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "Your distribution is no longer supported"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1094,78 +1094,83 @@ msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
#, fuzzy
+msgid "Add Cdrom"
+msgstr "Add _CD"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
+#, fuzzy
msgid "Authentication"
msgstr "A_uthentication"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
msgid "Download from:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
#, fuzzy
msgid "Import the public key from a trusted software provider"
msgstr "Remove the selected key from the trusted keyring."
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
#, fuzzy
msgid "Internet Updates"
msgstr "<b>Internet Updates</b>"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
#, fuzzy
msgid "Restore _Defaults"
msgstr "Restore default keys"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Software Properties"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "Source"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
@@ -1552,6 +1557,10 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "_Install"
+
+#, fuzzy
#~ msgid "Your system has already been upgraded."
#~ msgstr "Your system has broken packages!"
@@ -1585,10 +1594,6 @@ msgstr ""
#~ msgstr "<b>Details</b>"
#, fuzzy
-#~ msgid "Add _Cdrom"
-#~ msgstr "Add _CD"
-
-#, fuzzy
#~ msgid "Installation Media"
#~ msgstr "Installing updates..."
diff --git a/po/en_GB.po b/po/en_GB.po
index 79e4a5fc..809ea292 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+0200\n"
"PO-Revision-Date: 2006-05-23 19:41+0000\n"
"Last-Translator: Abigail Brady <morwen@evilmagic.org>\n"
"Language-Team: \n"
@@ -88,49 +88,49 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Software Updates"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "Source"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "Source"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Error importing selected file"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Error removing the key"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -138,11 +138,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -359,7 +359,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -557,7 +557,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
#, fuzzy
msgid "Your system is up-to-date"
msgstr "Your system is up-to-date!"
@@ -788,14 +788,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -839,7 +839,7 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr "Installing updates..."
#. TRANSLATORS: updates from an 'unknown' origin
@@ -866,99 +866,99 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Installing updates..."
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Version %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "Your distribution is no longer supported"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1091,80 +1091,85 @@ msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
#, fuzzy
+msgid "Add Cdrom"
+msgstr "Add _CD"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
+#, fuzzy
msgid "Authentication"
msgstr "A_uthentication"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
msgid "Download from:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
#, fuzzy
msgid "Import the public key from a trusted software provider"
msgstr "Remove the selected key from the trusted keyring."
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
#, fuzzy
msgid "Internet Updates"
msgstr "<b>Internet Updates</b>"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
#, fuzzy
msgid "Restore _Defaults"
msgstr "Restore default keys"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
#, fuzzy
msgid "Restore the default keys of your distribution"
msgstr "Restore default keys"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Software Properties"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "Source"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
#, fuzzy
msgid "_Check for updates automatically:"
msgstr "Installing updates..."
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
@@ -1552,6 +1557,10 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Installing updates..."
+
+#, fuzzy
#~ msgid "Your system has already been upgraded."
#~ msgstr "Your system has broken packages!"
@@ -1585,10 +1594,6 @@ msgstr ""
#~ msgstr "<b>Details</b>"
#, fuzzy
-#~ msgid "Add _Cdrom"
-#~ msgstr "Add _CD"
-
-#, fuzzy
#~ msgid "Installation Media"
#~ msgstr "Installing updates..."
diff --git a/po/es.po b/po/es.po
index 192a3272..25c9a9a5 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -90,52 +90,52 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Actualizaciones de software"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "Fuente"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "Fuente"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Importar clave"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Hubo un error al importar el archivo seleccionado"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Hubo un error al quitar la clave"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -146,11 +146,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Por favor, introduzca un nombre para el disco"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Por favor, inserte un disco en la unidad:"
@@ -412,7 +412,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Estos paquetes instalados ya no están soportados oficialmente, y desde ahora "
@@ -630,7 +630,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Su sistema está actualizado"
@@ -874,15 +874,15 @@ msgstr ""
"Ha fallado la autenticación de la actualización. Debe haber un problema con "
"la red o el servidor. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Descargando archivo %li de %li a %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Descargando archivo %li de %li a velocidad desconocida"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Descargando archivo %li de %li a %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -928,8 +928,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "Instalando actualizaciones"
+msgid "Distribution updates"
+msgstr "_Continuar actualización"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -956,75 +956,53 @@ msgstr ""
msgid "_Check All"
msgstr "_Comprobar"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Tamaño de descarga: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Por favor, espere; esto puede tardar un poco."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "La actualización se ha completado"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Comprobar las actualizaciones disponibles"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Nueva versión: %s (Tamaño: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versión %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "Su distribución ya no está soportada"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 "
@@ -1034,17 +1012,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:845
#, 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:880
msgid "Software index is broken"
msgstr "El índice de software está dañado"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1054,6 +1032,28 @@ msgstr ""
"gestor de paquetes «Synaptic», o ejecute «sudo apt-get install -f» en una "
"terminal, para corregir este problema primero."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1197,27 +1197,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Añadir _CD-ROM"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Autenticación"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "_Borrar archivos de software descargados:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "La descarga se ha completado"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Importar la clave pública desde un proveedor de confianza"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Actualizaciones por Internet"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1225,51 +1230,51 @@ msgstr ""
"Sólo se instalarán automáticamente las actualizaciones de seguridad que "
"provengan de los servidores oficiales de Ubuntu."
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "Restaurar valores predeterminados"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Restaurar las claves predeterminadas de su distribución"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Propiedades del software"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "Fuente"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_Comprobar actualizaciones automáticamente:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "_Descargar actualizaciones en segundo plano, pero sin instalarlas"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "_Importar clave"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "_Instalar actualizaciones de seguridad sin requerir confirmación"
@@ -1664,6 +1669,13 @@ msgstr "Software compatible con la DFSG con dependencias no libres"
msgid "Non-DFSG-compatible Software"
msgstr "Software no compatible con la DFSG"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Descargando archivo %li de %li a velocidad desconocida"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Instalando actualizaciones"
+
#~ msgid "Cancel _Download"
#~ msgstr "Cancelar _descarga"
@@ -1758,9 +1770,6 @@ msgstr "Software no compatible con la DFSG"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Claves</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Añadir _CD-ROM"
-
#~ msgid "Installation Media"
#~ msgstr "Soporte de la instalación"
diff --git a/po/fi.po b/po/fi.po
index a8d69c76..4c6655af 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -87,50 +87,50 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
msgid "Software Channel"
msgstr "Ohjelmistokanava"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr "Aktiivinen"
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "Lähdekoodi"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "Lähdekoodi"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Tuo avain"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Virhe tuotaessa valittua avainta"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Virhe poistettaessa avainta"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -141,11 +141,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Syötä nimi levylle"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Aseta levy asemaan:"
@@ -403,7 +403,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Seuraavia paketteja ei enää tueta virallisesti, vaan ovat nyt yhteisön "
@@ -616,7 +616,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Järjestelmäsi on ajan tasalla"
@@ -858,15 +858,15 @@ msgstr ""
"Päivityksen todennus epäonnistui. Tämä voi johtua ongelmasta "
"verkkoyhteydessä tai palvelimessa. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Noudetaan tiedostoa %li/%li tuntemattomalla nopeudella"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -907,8 +907,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "Asennetaan päivityksiä"
+msgid "Distribution updates"
+msgstr "_Jatka päivitystä"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -935,76 +935,53 @@ msgstr ""
msgid "_Check All"
msgstr "_Tarkista"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-#, fuzzy
-msgid "None"
-msgstr "Ei-vapaa"
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "%s täytyy noutaa"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Odota, tämä voi kestää jonkun aikaa."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "Päivitys on valmis"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Tarkista saatavilla olevat päivitykset"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Uusi versio: %s (koko: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versio: %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "Jakeluasi ei enää tueta"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 "
@@ -1014,17 +991,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:845
#, 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:880
msgid "Software index is broken"
msgstr "Ohjelmaluettelo on rikkinäinen"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1034,6 +1011,29 @@ msgstr ""
"Synaptic-pakettienhallintaa tai komentoa \"sudo apt-get install -f\" "
"päätteessä."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+#, fuzzy
+msgid "None"
+msgstr "Ei-vapaa"
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1176,27 +1176,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Lisää _CD"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Todennus"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "_Poista noudetut ohjelmatiedostot:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Lataus on valmis"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Asenna julkinen avain luotetulta ohjelmistotoimittajalta"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Internet-päivitykset"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1204,51 +1209,51 @@ msgstr ""
"Vain turvallisuuspäivitykset virallisilta Ubuntu-palvelimilta asennetaan "
"automaattisesti."
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "Palauta _oletukset"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Palauta jakelusi oletusavaimet"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "<b>Ohjelmalähteet</b>"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "Lähdekoodi"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_Tarkista päivitykset automaattisesti:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "_Lataa päivitykset taustalla, mutta älä asenna niitä"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "_Tuo avaintiedosto"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "_Asenna turvallisuuspäivitykset kysymättä"
@@ -1641,6 +1646,13 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr "DFSG-epäyhteensopivat ohjelmat"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Noudetaan tiedostoa %li/%li tuntemattomalla nopeudella"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Asennetaan päivityksiä"
+
#~ msgid "Cancel _Download"
#~ msgstr "Peruuta _nouto"
@@ -1728,9 +1740,6 @@ msgstr "DFSG-epäyhteensopivat ohjelmat"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Avaimet</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Lisää _CD"
-
#~ msgid "Installation Media"
#~ msgstr "Asennuslähteet"
diff --git a/po/fr.po b/po/fr.po
index fc3bc23f..b3c8b740 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,52 +88,52 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Mises à jour des logiciels"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "Source"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "Source"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Importer la clé"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Erreur lors de l'importation du fichier sélectionné"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Erreur lors de la suppression de la clé"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -144,11 +144,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Veuillez saisir un nom pour le disque"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Veuillez insérer un disque dans le lecteur :"
@@ -410,7 +410,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Ces paquets installées ne sont plus supportés officiellement. Ils sont "
@@ -629,7 +629,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Votre système est à jour"
@@ -872,15 +872,15 @@ msgstr ""
"Échec de l'authentification de la mise à jour. Il y a peut-être un problème "
"avec le réseau ou avec le serveur "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Téléchargement du fichier %li sur %li à %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Téléchargement du fichier %li sur %li à une vitesse inconnue"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Téléchargement du fichier %li sur %li à %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -926,8 +926,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "Installation des mises à jour"
+msgid "Distribution updates"
+msgstr "_Reprendre la mise à jour"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -954,75 +954,53 @@ msgstr ""
msgid "_Check All"
msgstr "_Vérifier"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Taille du téléchargement : %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Veuillez patienter, cela peut prendre du temps."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "La mise à jour est terminée"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Rechercher les mises à jour disponibles"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Nouvelle version : %s (taille : %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Version %s : \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "Votre distribution n'est plus supportée"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 "
@@ -1032,17 +1010,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:845
#, 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:880
msgid "Software index is broken"
msgstr "La liste des logiciels est corrompue"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1052,6 +1030,28 @@ msgstr ""
"utiliser d'abord le « Gestionnaire de paquets Synaptic » ou lancez « sudo "
"apt-get install -f » dans un terminal pour réparer ce problème."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1196,28 +1196,33 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Ajouter un _CD-ROM"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Authentification"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "_Effacer les fichiers des logiciels téléchargés :"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Le téléchargement est terminé"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr ""
"Importer la clé publique d'un fournisseur de logiciels digne de confiance"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Mises à jour par Internet"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1225,52 +1230,52 @@ msgstr ""
"Seules les mises à jour de sécurité des serveurs officiels d'Ubuntu seront "
"automatiquement installées."
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "Restaurer les clés par _défaut"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Restaurer les clés par défaut de votre distribution"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Gestionnaire de canaux logiciels"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "Source"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_Rechercher des mises à jour automatiquement :"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr ""
"Télécharger les mises à jour en arrière-plan, mais ne pas les installer"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "_Importer la clé"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "_Installer les mises à jour de sécurité sans confirmation"
@@ -1668,6 +1673,13 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Téléchargement du fichier %li sur %li à une vitesse inconnue"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Installation des mises à jour"
+
#~ msgid "Cancel _Download"
#~ msgstr "_Annuler le téléchargement"
@@ -1759,9 +1771,6 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Clés</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Ajouter un _CD-ROM"
-
#~ msgid "Installation Media"
#~ msgstr "Médium d'installation"
diff --git a/po/fur.po b/po/fur.po
index 2e2e4f43..b80b99e6 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,45 +88,45 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Impuarte la clâf"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -134,11 +134,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -350,7 +350,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -544,7 +544,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr ""
@@ -768,14 +768,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -812,7 +812,7 @@ msgid "Backports"
msgstr ""
#: ../UpdateManager/UpdateManager.py:240
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
@@ -837,97 +837,97 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
msgid "Checking for updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1054,73 +1054,77 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
-msgid "Authentication"
+msgid "Add Cdrom"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:10
-msgid "D_elete downloaded software files:"
+msgid "Authentication"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:11
-msgid "Download from:"
+msgid "D_elete downloaded software files:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:12
-msgid "Import the public key from a trusted software provider"
+msgid "Download from:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:13
-msgid "Internet Updates"
+msgid "Import the public key from a trusted software provider"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
msgid "Software Sources"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 29b5780d..cc611a5c 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -89,52 +89,52 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Actualizacións de software"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "Fonte"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "Fonte"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Erro importando o ficheiro seleccionado"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Erro ao quitar a clave"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -142,11 +142,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -365,7 +365,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -562,7 +562,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
#, fuzzy
msgid "Your system is up-to-date"
msgstr "O seu sistema está actualizado!"
@@ -794,14 +794,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -845,7 +845,7 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr "Instalando actualizacións..."
#. TRANSLATORS: updates from an 'unknown' origin
@@ -872,99 +872,99 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Instalando actualizacións..."
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versión %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
#, 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:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1096,80 +1096,84 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+msgid "Add Cdrom"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Autenticación"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
msgid "Download from:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
#, fuzzy
msgid "Import the public key from a trusted software provider"
msgstr "Eliminar a clave seleccionada do anel de confianza."
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
#, fuzzy
msgid "Internet Updates"
msgstr "<b>Actualizacións por Internet</b>"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
#, fuzzy
msgid "Restore _Defaults"
msgstr "Restaurar predeterminados"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
#, fuzzy
msgid "Restore the default keys of your distribution"
msgstr "Restaurar as claves predeterminadas"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Propiedades de software"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "Fonte"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
#, fuzzy
msgid "_Check for updates automatically:"
msgstr "Comprobar se hai actualizacións cada"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
@@ -1557,6 +1561,10 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Instalando actualizacións..."
+
+#, fuzzy
#~ msgid "Important security updates of Ubuntu"
#~ msgstr "Actualizacións de seguranza de Ubuntu 5.10"
diff --git a/po/he.po b/po/he.po
index a6f5c58e..761d9293 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -92,48 +92,48 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "עדכוני תוכנה"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "מקור"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "מקור"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "שגיאה בייבוא קובץ נבחר"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "הקובץ הנבחר הוא לא מפתח GPG או שהוא לא תקין."
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "שגיאה בהסרת המפתח"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג."
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -144,11 +144,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "אנא הכניסו תקליטור לכונן:"
@@ -371,7 +371,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -571,7 +571,7 @@ msgstr "כדי למנוע אובדן מידע אנא סגרו על תוכנית
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
#, fuzzy
msgid "Your system is up-to-date"
msgstr "המערכת שלך מעודכנת!"
@@ -801,15 +801,15 @@ msgid ""
"or with the server. "
msgstr "אימות השדרוג נכשל. עלולה להיות בעיה עם הרשת או עם השרת. "
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, fuzzy, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה"
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, fuzzy, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "מוריד קובץ %li מתוך %li במהירות לא ידועה"
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -850,8 +850,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "מתקין עדכונים..."
+msgid "Distribution updates"
+msgstr "_המשך בשידרוג"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -877,100 +877,100 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, fuzzy, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "מתקין עדכונים..."
msgstr[1] "מתקין עדכונים..."
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
#, fuzzy
msgid "Update is complete"
msgstr "ההורדה הושלמה"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "מתקין עדכונים..."
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "גרסה %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "ההפצה שלך כבר לא נתמכת, סליחה."
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1111,81 +1111,85 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+msgid "Add Cdrom"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "אימות"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "ההורדה הושלמה"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
#, fuzzy
msgid "Import the public key from a trusted software provider"
msgstr "הסר את המפתח הנבחר מרשימת המפתחות שאתה בוטח בהם."
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
#, fuzzy
msgid "Internet Updates"
msgstr "<b>עדכוני אינטרנט</b>"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
#, fuzzy
msgid "Restore _Defaults"
msgstr "שחזר ברירת מחדל"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
#, fuzzy
msgid "Restore the default keys of your distribution"
msgstr "שחזר מפתחות ברירת מחדל"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "מאפייני תוכנה"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "מקור"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
#, fuzzy
msgid "_Check for updates automatically:"
msgstr "בדוק לעדכונים כל"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
@@ -1571,6 +1575,14 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
+#, fuzzy
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "מוריד קובץ %li מתוך %li במהירות לא ידועה"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "מתקין עדכונים..."
+
#~ msgid "Could not find any upgrades"
#~ msgstr "לא ניתן למצוא שדרוג זמין"
diff --git a/po/hi.po b/po/hi.po
index 46ab03e4..8a95c9a7 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,45 +88,45 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -134,11 +134,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -350,7 +350,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -544,7 +544,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr ""
@@ -768,14 +768,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -812,7 +812,7 @@ msgid "Backports"
msgstr ""
#: ../UpdateManager/UpdateManager.py:240
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
@@ -837,97 +837,97 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
msgid "Checking for updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1054,73 +1054,77 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
-msgid "Authentication"
+msgid "Add Cdrom"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:10
-msgid "D_elete downloaded software files:"
+msgid "Authentication"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:11
-msgid "Download from:"
+msgid "D_elete downloaded software files:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:12
-msgid "Import the public key from a trusted software provider"
+msgid "Download from:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:13
-msgid "Internet Updates"
+msgid "Import the public key from a trusted software provider"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
msgid "Software Sources"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 2bd1b2f4..e38d5605 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -89,47 +89,47 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Nadogradnje programa"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Unos ključa"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Greška prilikom uvoženja odabrane datoteke"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Greška prilikom brisanja ključa"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -140,11 +140,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Upišite ime za disk"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Ubacite CD u uređaj:"
@@ -400,7 +400,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Ovi instalirani paketi više nisu službeno podržani i sada se nalaze u "
@@ -619,7 +619,7 @@ msgstr "Da spriječite gubitak podataka zatvorite sve programe i datoteke."
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Vaš sustav sadrži posljednje nadogradnje"
@@ -861,15 +861,15 @@ msgstr ""
"Autorizacija nadogradnje nije uspjela. Vjerovatno je problem u mreži ili sa "
"poslužiteljem. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Preuzimam datoteku %li od %li pri %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Preuzimam datoteku %li od %li nepoznatom brzinom"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Preuzimam datoteku %li od %li pri %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -913,8 +913,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "_Instaliraj nadogradnje"
+msgid "Distribution updates"
+msgstr "_Nastavi nadogradnju"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -941,35 +941,13 @@ msgstr ""
msgid "_Check All"
msgstr "Pro_vjeri"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Veličina preuzimanja: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -977,40 +955,40 @@ msgstr[0] "Možete instalirati %s nadogradnju"
msgstr[1] "Možete instalirati %s nadogradnje"
msgstr[2] "Možete instalirati %s nadogradnji"
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Molim pričekajte, ovo može potrajati."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "Nadogradnja je gotova"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "_Instaliraj nadogradnje"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Nova verzija: %s (Veličina: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Verzija %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "Vaša distibucija više nije podržana"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 "
@@ -1020,17 +998,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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr "Popis programa je oštećen"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1040,6 +1018,28 @@ msgstr ""
"upravitelja paketima \"Synaptic\" ili upišite \"sudo apt-get install -f\" u "
"terminal za ispravljanje ovog problema."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1182,27 +1182,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Dodaj _CD-ROM"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Autorizacija"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "_Obriši dobavljene datoteke programa:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Preuzimanje je završeno"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Uvezi javni ključ od pouzdanog davatelja programa"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Internet nadogradnje"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1210,50 +1215,50 @@ msgstr ""
"Samo sigrnosne nadogradnje sa službenih Ubuntu poslužitelja biti će "
"instalirane automatski"
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "Vrati _uobičajene postavke"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Vrati uobičajene ključeve vaše distribucije"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Postavke nadogradnje"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_Provjeri postojanje nadogradnji automatski:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "P_reuzmi nadogradnje u pozadini, ali ih ne instaliraj"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "_Unesi datoteku ključa"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "_Instaliraj sigurnosne nadogradnje bez potvrde"
@@ -1642,6 +1647,13 @@ msgstr "DFSG-kompatibilni programi sa neslobodnim ovisnostima"
msgid "Non-DFSG-compatible Software"
msgstr "DFSG-nekompatibilni programi"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Preuzimam datoteku %li od %li nepoznatom brzinom"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "_Instaliraj nadogradnje"
+
#~ msgid "Cancel _Download"
#~ msgstr "Prekini _preuzimanje"
@@ -1731,9 +1743,6 @@ msgstr "DFSG-nekompatibilni programi"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Kjučevi</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Dodaj _CD-ROM"
-
#~ msgid "Installation Media"
#~ msgstr "Instalacijski medij"
diff --git a/po/hu.po b/po/hu.po
index 80f7f2cc..75c9d3f6 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,47 +88,47 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Szoftverfrissítések"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Kulcs importálása"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Hiba a kiválasztott fájl importálása közben"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Hiba a kulcs eltávolítása közben"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -139,11 +139,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Kérem, adja meg a lemez nevét"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Kérem, helyezzen be egy lemezt a meghajtóba:"
@@ -401,7 +401,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Ezek a telepített csomagok már nincsenek hivatalosan támogatva, csak a "
@@ -617,7 +617,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "A rendszere naprakész"
@@ -858,15 +858,15 @@ msgstr ""
"A frissítés hitelesítése meghiúsult. Probléma lehet a hálózattal vagy a "
"kiszolgálóval. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "%li. fájl letöltése, összesen: %li, sebesség: %s/mp"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "%li. fájl letöltése, összesen: %li, ismeretlen sebességgel"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "%li. fájl letöltése, összesen: %li, sebesség: %s/mp"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -908,8 +908,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "_Telepítés"
+msgid "Distribution updates"
+msgstr "Frissítés _folytatása"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -936,74 +936,52 @@ msgstr ""
msgid "_Check All"
msgstr "_Ellenőrzés"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Letöltés mérete: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Kis türelmet, ez eltarthat egy ideig."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "A frissítés befejeződött"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "_Telepítés"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Új verzió: %s (Méret: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "%s verzió: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "A terjesztés már nem támogatott"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 +991,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:845
#, 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:880
msgid "Software index is broken"
msgstr "A szoftverindex sérült"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1033,6 +1011,28 @@ msgstr ""
"csomagkezelőt vagy futtassa a \"sudo apt-get install -f\" parancsot egy "
"terminálban a probléma megoldása érdekében."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1177,27 +1177,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "_CD hozzáadása"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Hitelesítés"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "L_etöltött csomagok törlése:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "A letöltés befejeződött"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Megbízható szoftverszolgáltató publikus kulcsának importálása"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Hálózati frissítések"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1205,50 +1210,50 @@ msgstr ""
"Csak az Ubuntu kiszolgálóiról származó biztonsági frissítések kerülnek "
"automatikusan telepítésre."
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "_Alapértelmezés visszaállítása"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "A disztribúcióra jellemző alapértelmezett kulcsok visszaállítása"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Szoftvertulajdonságok"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_Frissítések automatikus keresése:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "Frissítések _letöltése a háttérben, telepítés nélkül"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "_Kulcsfájl importálása"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "_Biztonsági frissítések telepítése megerősítés nélkül"
@@ -1638,6 +1643,13 @@ msgstr "DFSG-kompatibilis szoftver nem-szabad függőségekkel"
msgid "Non-DFSG-compatible Software"
msgstr "Nem DFSG-kompatibilis szoftver"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "%li. fájl letöltése, összesen: %li, ismeretlen sebességgel"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "_Telepítés"
+
#~ msgid "Cancel _Download"
#~ msgstr "Letöltés _megszakítása"
@@ -1729,9 +1741,6 @@ msgstr "Nem DFSG-kompatibilis szoftver"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Kulcsok</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "_CD hozzáadása"
-
#~ msgid "Installation Media"
#~ msgstr "Telepítő média"
diff --git a/po/id.po b/po/id.po
index 01f13cbe..6928cfba 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -87,48 +87,48 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Perangkat Lunak Mutakhir"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Impor kunci"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Kesalahan mengimpor berkas terpilih"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Kesalahan menghapus kunci"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -139,11 +139,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Silakan masukkan nama untuk cakram"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Silakan masukan cakram ke dalam penggerak"
@@ -401,7 +401,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Paket terinstal ini tidak lagi mendapat sokongan resmi, dan sekarang hanya "
@@ -615,7 +615,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Sistem anda telah up-to-date"
@@ -854,15 +854,15 @@ msgstr ""
"Otentikasi upgrade gagal. Mungkin terjadi masalah dengan jaringan atau "
"dengan server. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Mengunduh berkas %li dari %li dengan %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Kecepatan mengunduh berkas %li dari %li tidak diketahui"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Mengunduh berkas %li dari %li dengan %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -904,8 +904,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "_Instal Update"
+msgid "Distribution updates"
+msgstr "_Lanjutkan Upgrade"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -932,74 +932,52 @@ msgstr ""
msgid "_Check All"
msgstr "_Periksa"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Ukuran unduh: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Silakan tunggu, hal ini membutuhkan beberapa waktu."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "Pemutakhiran selesai"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "_Instal Update"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Versi baru: %s (Ukuran: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versi %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "Distribusi anda tidak disokong lagi"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 "
@@ -1009,17 +987,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:845
#, 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:880
msgid "Software index is broken"
msgstr "Indeks perangkat lunak telah rusak"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1029,6 +1007,28 @@ msgstr ""
"Silakan gunakan manajer paket \"Synaptic\" atau jalankan \"sudo apt-get "
"install -f\" dalam terminal untuk memperbaiki persoalan ini."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1172,27 +1172,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Tambah _Cdrom"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Otentikasi"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "H_apus berkas perangkat lunak yang telah diunduh:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Unduh telah selesai"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Impor kunci publik dari penyedia perangkal lunak terpercaya"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Pemutakhiran lewat Internet"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1200,50 +1205,50 @@ msgstr ""
"Hanya pemutakhiran keamanan dari server resmi Ubuntu yang akan diinstal "
"secara otomatis"
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "Kembali ke _Baku"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Kembalikan kunci baku dari distribusi anda"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Properti Perangkat Lunak"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_Periksa pemutakhiran secara otomatis:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "_Unduh pemutakhiran di latar belakang, tetapi jangan diinstal"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "_Impor Berkas Kunci"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "_Instal pemutakhiran keamanan tanpa perlu konfirmasi"
@@ -1633,6 +1638,13 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr "Perangkat Lunak yang tidak sesuai dengan DFSG"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Kecepatan mengunduh berkas %li dari %li tidak diketahui"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "_Instal Update"
+
#~ msgid "Cancel _Download"
#~ msgstr "Batalkan _Unduh"
@@ -1726,9 +1738,6 @@ msgstr "Perangkat Lunak yang tidak sesuai dengan DFSG"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Kunci</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Tambah _Cdrom"
-
#~ msgid "Installation Media"
#~ msgstr "Media Instalasi"
diff --git a/po/it.po b/po/it.po
index 8c425535..19ee6648 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -89,52 +89,52 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Aggiornamenti Software"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "Sorgente"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "Sorgente"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Importa chiave"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Errore nell'importare il file selezionato"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Errore nel rimuovere la chiave"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -145,11 +145,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Inserire un nome per il disco"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Inserire un disco nell'unità:"
@@ -410,7 +410,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Questi pacchetti, pur essendo installati, non sono più supportati "
@@ -629,7 +629,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Il sistema è aggiornato!"
@@ -871,15 +871,15 @@ msgstr ""
"Fallita l'autenticazione dell'aggiornamento. Potrebbe dipendere da un "
"problema con la connessione di rete o con il server. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Scaricamento del file %li di %li a %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Scaricamento del file %li di %li a velocità sconosciuta"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Scaricamento del file %li di %li a %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -923,8 +923,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "Installazione degli aggiornamenti"
+msgid "Distribution updates"
+msgstr "_Riprendi aggiornamento"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -951,75 +951,53 @@ msgstr ""
msgid "_Check All"
msgstr "_Verifica"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Dati da scaricare: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Attendere, l'operazione potrebbere richiedere del tempo."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "Aggiornamento completato"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Verifica degli aggiornamenti..."
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Nuova versione: %s (Dimensione: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versione %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "La distribuzione in uso non è più supportata"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 "
@@ -1029,17 +1007,17 @@ msgstr ""
"versione più aggiornata di Ubuntu Linux. Per maggiori informazioni "
"consultare http://www.ubuntu.com"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr "L'indice dei programmi è rovinato"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1049,6 +1027,28 @@ msgstr ""
"dei pacchetti \"Synaptic\" o inserire il comando \"sudo apt-get install -f\" "
"in un terminale per risolvere il problema."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1192,27 +1192,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Aggiungi C_D-ROM"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Autenticazione"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "_Elimina i file di software scaricati:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Scaricamento completato"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Importa la chiave pubblica da un fornitore di software fidato"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Aggiornamenti internet"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1220,51 +1225,51 @@ msgstr ""
"Solo gli aggiornamenti di sicurezza dai servers ufficiali di Ubuntu saranno "
"installati automaticamente"
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "Ripristina pre_definite"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Ripristina le chiavi predefinite della distribuzione in uso"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Proprietà software"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "Sorgente"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_Verificare aggiornamenti automaticamente:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "_Scaricare gli aggiornamenti in background, ma non installarli"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "I_mporta file chiave"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "I_nstallare gli aggiornamenti di sicurezza senza richiedere conferma"
@@ -1660,6 +1665,13 @@ msgstr "Software compatibile con le DFSG con dipendenze non libere"
msgid "Non-DFSG-compatible Software"
msgstr "Software non compatibile con le DFSG"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Scaricamento del file %li di %li a velocità sconosciuta"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Installazione degli aggiornamenti"
+
#~ msgid "Cancel _Download"
#~ msgstr "Annulla _scaricamento"
@@ -1754,9 +1766,6 @@ msgstr "Software non compatibile con le DFSG"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Chiavi</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Aggiungi C_D-ROM"
-
#~ msgid "Installation Media"
#~ msgstr "Supporto di installazione"
diff --git a/po/ja.po b/po/ja.po
index 2c8109c8..1a4d0e71 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -89,49 +89,49 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "ソフトウェアのアップデート"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "ソース"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "ソース"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "鍵のインポート"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "選択したファイルのインポートエラー"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"選択したファイルはGPG鍵ファイルではないか、壊れている可能性があります。"
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "鍵削除のエラー"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "選択した鍵を削除できませんでした。バグとして報告してください。"
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -142,11 +142,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "ディスク名を入力してください"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "ディスクをドライブに挿入してください:"
@@ -399,7 +399,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"インストールされているこれらのパッケージは、もう公式にサポートされておらず、"
@@ -610,7 +610,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "システムは最新の状態です!"
@@ -847,15 +847,15 @@ msgstr ""
"アップグレードの認証に失敗しました。おそらくネットワークまたはサーバの問題で"
"す。 "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "ダウンロード中: %li のうち %li 速度 %s/秒"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "ダウンロード中: 速度不明で %li のうち %li"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "ダウンロード中: %li のうち %li 速度 %s/秒"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -897,8 +897,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "アップデートをインストール中"
+msgid "Distribution updates"
+msgstr "アップグレードを再開する(_R)"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -925,74 +925,52 @@ msgstr ""
msgid "_Check All"
msgstr "チェック(_C)"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "ダウンロードサイズ: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "%s 個のアップデートがインストールされます"
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "しばらくお待ちください。少々時間がかかります。"
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "アップデートが完了しました"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "インストールできるアップデートをチェック"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "新しいバージョン: %s (サイズ: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "バージョン %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "このディストリビューションはすでにサポート対象外です"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 +980,17 @@ msgstr ""
"Ubuntu Linux にアップグレードしてください。\r\n"
"アップグレードに関する詳細な情報は http://www.ubuntu.com をご覧ください。"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr "ソフトウェアのインデックスが壊れています"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1022,6 +1000,28 @@ msgstr ""
"ケージマネージャを使用するか、 まずこの問題を解決するために \"sudo apt-get "
"install -f\" コマンドをターミナルで実行してください。"
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1165,27 +1165,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "CD-ROM の追加(_C)"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "認証"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "ダウンロードしたファイルを削除(_E):"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "ダウンロードが完了しました"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "信頼したソフトウェア供給者の公開鍵をインポートする"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "インターネットアップデート"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1193,51 +1198,51 @@ msgstr ""
"公式な Ubuntu サーバからのセキュリティアップデートだけ自動的にインストールさ"
"れます。"
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "デフォルトに戻す(_D)"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "ディストリビューション標準の鍵を元に戻す"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "ソフトウェアのプロパティ"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "ソース"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "アップデートを自動的にチェックする(_C):"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "アップデートを自動的にダウンロード、ただしインストールはしない(_D)"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "鍵ファイルのインポート(_I)"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "確認せずにセキュリティアップデートをインストール(_I)"
@@ -1627,6 +1632,13 @@ msgstr "非フリーな依存関係のあるDFSG適合ソフトウェア"
msgid "Non-DFSG-compatible Software"
msgstr "DFSGに適合しないソフトウェア"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "ダウンロード中: 速度不明で %li のうち %li"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "アップデートをインストール中"
+
#~ msgid "Cancel _Download"
#~ msgstr "ダウンロードをキャンセル(_D)"
@@ -1718,9 +1730,6 @@ msgstr "DFSGに適合しないソフトウェア"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>鍵</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "CD-ROM の追加(_C)"
-
#~ msgid "Installation Media"
#~ msgstr "インストールメディア"
diff --git a/po/ka.po b/po/ka.po
index 2384bc56..2beae0f1 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -90,49 +90,49 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "პროგრამული განახლებები"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "გასაღების იმპორტი"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "ამორჩეული ფაილის იმპორტი ვერ მოხერხდა"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"ამორჩეული ფაილი შეიძლება არ იყოს GPG გასაღების ფაილი ან შეიძლება იყოს "
"დაზიანებული."
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "გასღების წაშლა ვერ მოხერხდა"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"ამორჩეული გასაღების წაშლა ვე რმოხერხდა. გთხოვთ აცნობოთ ეს როგორც ხარვეზი."
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -143,11 +143,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "შეიყვანეთ დისკის სახელი"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "მოათავსეთ დისკი დისკწამყვანში:"
@@ -386,7 +386,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr "არა და ახლა n t ჩართული -თვის -ში ნაბიჯი "
@@ -588,7 +588,7 @@ msgstr "ვის დახურვა ყველა გახსნა დ
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "თქვენი სისტემა განახლებულია"
@@ -829,14 +829,14 @@ msgid ""
"or with the server. "
msgstr "მიმდენარეობს აუტენტიფიკაცია ვერ შედგა a ან "
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -880,8 +880,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "განახლებების _დაყენება"
+msgid "Distribution updates"
+msgstr "განახლება _გაგრძელება"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -908,74 +908,52 @@ msgstr ""
msgid "_Check All"
msgstr "შ_ემოწმება"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "ჩამოსატვირთის ზომა: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "თქვენ შეგიძლიათ %s განახლების ჩადგმა"
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "გთხოვთ მოითმინოთ, მიმდინარე პროცესს საკმაო დრო ესაჭიორება."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "განახლება გასრულებულია"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "განახლებების _დაყენება"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "ახალი ვერსია: %s (ზომა: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "ვერსია %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "თქვენი დისტრიბუტივს აღარ გააჩნია მხარდაჭერა"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
#, fuzzy
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
@@ -985,17 +963,17 @@ msgstr ""
"თქვენ არა ნებისმიერი ან კრიტიკული განახლება -სკენ a ვერსია ის ლინუქსი "
"იხილეთhttp://www.ubuntu.com -თვის ინფორმაცია ჩართულია."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr "პროგრამების სიის ინდექსი დაზიანებულია"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
#, fuzzy
msgid ""
"It is impossible to install or remove any software. Please use the package "
@@ -1004,6 +982,28 @@ msgid ""
msgstr ""
"ტოლია -სკენ ან წაშლა ნებისმიერი Synaptic ან sudo -ში a ტერმინალი -სკენ."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1148,81 +1148,86 @@ msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
#, fuzzy
+msgid "Add Cdrom"
+msgstr "დამატება"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
+#, fuzzy
msgid "Authentication"
msgstr "აუთენტიფიკაცია"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "ჩამოტვირთული პაკეტების ფაილების წ_აშლა:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "ჩამოტვირთვა ტოლია სრული"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
#, fuzzy
msgid "Import the public key from a trusted software provider"
msgstr "იმპორტი გასაღები a"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "ინტერნეტ განახლებები"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
#, fuzzy
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr "მხოლოდ"
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
#, fuzzy
msgid "Restore _Defaults"
msgstr "ნაგულისხმები პარამეტრები"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
#, fuzzy
msgid "Restore the default keys of your distribution"
msgstr "ნაგულისხმევი ის დისტრიბუტივი"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "პროგრამა პარამეტრები"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "განახლებების ავტომატური შ_ემოწმება:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "ჩამოტვირთვა -ში არა"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
#, fuzzy
msgid "_Import Key File"
msgstr "იმპორტი გასაღები ფაილი"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
#, fuzzy
msgid "_Install security updates without confirmation"
msgstr "დაყენება"
@@ -1607,6 +1612,10 @@ msgstr "პროგრამა თავისუფალი დამოკ
msgid "Non-DFSG-compatible Software"
msgstr "პროგრამა"
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "განახლებების _დაყენება"
+
#~ msgid "Cancel _Download"
#~ msgstr "ჩამოტვირთვის _გაუქმება"
@@ -1689,10 +1698,6 @@ msgstr "პროგრამა"
#~ msgstr "<b>გასაღებები</b>"
#, fuzzy
-#~ msgid "Add _Cdrom"
-#~ msgstr "დამატება"
-
-#, fuzzy
#~ msgid "Installation Media"
#~ msgstr "დაყენება მედია"
diff --git a/po/ko.po b/po/ko.po
index 1152fb5e..9f8df151 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,46 +88,46 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "소프트웨어 업데이트"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "키 가져오기"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "선택한 파일 가져오기 오류"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "선택된 파일은 GPG 키 파일이 아니거나 잘못된 것입니다."
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "키 삭제 오류"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "선택한 키를 지울 수 없습니다. 버그 리포팅 하십시오."
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -138,11 +138,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "디스크에 사용할 이름을 입력하십시오."
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "드라이브에 디스크를 넣으십시오:"
@@ -395,7 +395,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"이 소프트웨어들은 더 이상 공식적으로 지원하지 않으며, 이제 Universe 계열에 해"
@@ -604,7 +604,7 @@ msgstr "데이터 손실을 막으려면 열려있는 모든 프로그램과 문
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "시스템이 최신의 상태입니다."
@@ -843,15 +843,15 @@ msgstr ""
"업그레이드를 인증하는데 실패했습니다.네트워크나 서버에 문제가 있을 수 있습니"
"다. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "%li 의 %li 파일 내려 받는 중, 속도 %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "%li 의 %li 파일 내려 받는 중, 속도 알 수 없음"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "%li 의 %li 파일 내려 받는 중, 속도 %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -892,8 +892,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "업데이트를 설치(_I)"
+msgid "Distribution updates"
+msgstr "업그레이드 계속(_R)"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -920,74 +920,52 @@ msgstr ""
msgid "_Check All"
msgstr "점검(_C)"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "다운로드 크기: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "%s 개의 업데이트를 설치할 수 있습니다."
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "잠시만 기다리십시오. 이 작업은 약간의 시간이 걸립니다."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "업데이트가 끝났습니다."
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "업데이트를 설치(_I)"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "새 버전: %s (크기: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "버전 %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "더 이상 지원되지 않는 배포판입니다."
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 +975,17 @@ msgstr ""
"그레이드 하십시오. 업그레이드에 대한 더 많은 정보는 http://www.ubuntu.com에"
"서 보실 수 있습니다."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:845
#, 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:880
msgid "Software index is broken"
msgstr "소프트웨어 목록이 망가졌습니다."
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1016,6 +994,28 @@ msgstr ""
"어떤 소프트웨어도 설치하거나 삭제할 수 없습니다. \"시냅틱\"이나 터미널에서 "
"\"sudo apt-get install -f\"를 실행하여 이 문제를 먼저 해결하십시오."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1158,76 +1158,81 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "CD롬 추가(_C)"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "인증"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "다운로드 받은 소프트웨어 파일 삭제(_e):"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "다운로드가 끝났습니다."
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "믿을 만한 소프트웨어 제공자로부터 공개 키를 가져옵니다."
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "인터넷 업데이트"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr "공식 우분투 서버의 보안 업데이트만 자동으로 설치됩니다."
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "기본값 불러오기(_D)"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "배포판의 기본 키 불러오기"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "소프트웨어 설정"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "업데이트를 자동으로 확인(_C):"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "백그라운드에서 업데이트 다운로드하되, 설치는 하지 않음(_D)"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "키 가져오기(_I)"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "확인없이 보안 업데이트 설치(_I)"
@@ -1613,6 +1618,13 @@ msgstr "DFSG 호환이지만 자유소프트웨어가 아닌 의존성이 있는
msgid "Non-DFSG-compatible Software"
msgstr "DFSG와 호환이 안되는 소프트웨어"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "%li 의 %li 파일 내려 받는 중, 속도 알 수 없음"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "업데이트를 설치(_I)"
+
#~ msgid "Cancel _Download"
#~ msgstr "다운로드 취소(_D)"
@@ -1702,9 +1714,6 @@ msgstr "DFSG와 호환이 안되는 소프트웨어"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>키</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "CD롬 추가(_C)"
-
#~ msgid "Installation Media"
#~ msgstr "설치 미디어"
diff --git a/po/ku.po b/po/ku.po
index 4d7c2631..31740c00 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,45 +88,45 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -134,11 +134,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -350,7 +350,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -545,7 +545,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Sîstema te rojane ye"
@@ -769,14 +769,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -813,7 +813,7 @@ msgid "Backports"
msgstr ""
#: ../UpdateManager/UpdateManager.py:240
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
@@ -838,97 +838,97 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Mezinahiya daxistinê: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "Rojanekirin temam bû"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
msgid "Checking for updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Guhertoya nû: %s (Mezinahî: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Guhertoya %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1058,75 +1058,79 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
-msgid "Authentication"
+msgid "Add Cdrom"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:10
-msgid "D_elete downloaded software files:"
+msgid "Authentication"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:11
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Daxistin hatiye temam kirin"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Taybetmendiyên Nivîsbariyê"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 0aca5ce7..bd7f8252 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,47 +88,47 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Programinės įrangos atnaujinimai"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Importuoti raktą"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Importuojant pasirinktą failą įvyko klaida"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Šalinant raktą įvyko klaida"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -139,11 +139,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Įveskite disko pavadinimą"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Įdėkite diską į įrenginį:"
@@ -387,7 +387,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Šie įdiegti paketai nebėra oficialiai palaikomi. Dabar juos palaiko "
@@ -607,7 +607,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Jūsų sistema atnaujinta"
@@ -850,15 +850,15 @@ msgstr ""
"Nepavyko patvirtinti atnaujinimo autentiškumo. Gali būti tinklo arba "
"serverio problema. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Atsiunčiamas failas %li iš %li, %s/s greičiu"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Atsiunčiamas failas %li iš %li, nežinomu greičiu"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Atsiunčiamas failas %li iš %li, %s/s greičiu"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -898,8 +898,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "Diegiami atnaujinimai"
+msgid "Distribution updates"
+msgstr "_Tęsti atnaujinimą"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -926,35 +926,13 @@ msgstr ""
msgid "_Check All"
msgstr "_Patikrinti"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Atsiuntimo dydis: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, fuzzy, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -962,40 +940,40 @@ msgstr[0] "Rodyti ir įdiegti galimus atnaujinimus"
msgstr[1] "Rodyti ir įdiegti galimus atnaujinimus"
msgstr[2] "Rodyti ir įdiegti galimus atnaujinimus"
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Palaukite, tai gali užtrukti."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "Atnaujinimas užbaigtas"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Diegiami atnaujinimai"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Nauja versija: %s (Dydis: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versija %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "Jūsų distribucija daugiau nebepalaikoma"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 "
@@ -1005,17 +983,17 @@ msgstr ""
"Atnaujinkite į naujausią „Ubuntu Linux“ versiją. Daugiau informacijos apie "
"atnaujinimą rasite http://www.ubuntu.com ."
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr "Programinės įrangos turinys sugadintas"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1025,6 +1003,28 @@ msgstr ""
"pasinaudokite „Synaptic“ arba terminale įvykdykite komandą „sudo apt-get "
"install -f“, norėdami ištaisyti šią problemą."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1168,27 +1168,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Pridėti _CD"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Autentikacija"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "Iš_trinti atsiųstus programinės įrangos failus:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Atsiųsta"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Importuoti viešą raktą iš patikimo programinės įrangos tiekėjo"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Internetiniai atnaujinimai"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
#, fuzzy
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
@@ -1197,51 +1202,51 @@ msgstr ""
"Tik saugumo atnaujinimai iš oficialių „Ubuntu“ serverių bus automatiškai "
"įdiegti, todėl turi būti įdiegtas „unattended-upgrades“ programų paketas."
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "Atkurti _numatytuosius"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Atkurti _numatytuosius Jūsų distributyvui raktus"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Programinės įrangos šaltiniai"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_Ieškoti atnaujinimų automatiškai:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "_Atsiųsti atnaujinimus fone, tačiau jų neįdiegti"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
#, fuzzy
msgid "_Import Key File"
msgstr "Importuoti raktą"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "Į_diegti saugumo atnaujinimus neklausiant patvirtinimo"
@@ -1630,6 +1635,13 @@ msgstr "Su DFSG suderinama programinė įranga su Ne Laisvomis priklausomybėmis
msgid "Non-DFSG-compatible Software"
msgstr "Su DFSG nesuderinama programinė įranga"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Atsiunčiamas failas %li iš %li, nežinomu greičiu"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Diegiami atnaujinimai"
+
#~ msgid "Cancel _Download"
#~ msgstr "Atšaukti _atsiuntimą"
@@ -1717,9 +1729,6 @@ msgstr "Su DFSG nesuderinama programinė įranga"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Raktai</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Pridėti _CD"
-
#~ msgid "Installation Media"
#~ msgstr "Diegimo laikmenos"
diff --git a/po/mk.po b/po/mk.po
index 63ca4336..06b8b8bb 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -89,51 +89,51 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Надградба на софтвер"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "Изворен код"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "Изворен код"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Грешка при увоз на избраната датотека"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"Избраната датотека може да не е GPG датотека или пак може да е расипана."
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Грешка при отстранување на клучот"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова "
"како бубачка."
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -141,11 +141,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -365,7 +365,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -565,7 +565,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
#, fuzzy
msgid "Your system is up-to-date"
msgstr "Вашиот систем е надграден!"
@@ -797,14 +797,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -848,7 +848,7 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr "Инсталирам надградби..."
#. TRANSLATORS: updates from an 'unknown' origin
@@ -875,35 +875,13 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, fuzzy, python-format
msgid "Download size: %s"
msgstr "Преземам промени"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, fuzzy, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -911,64 +889,86 @@ msgstr[0] "Инсталирам надградби..."
msgstr[1] "Инсталирам надградби..."
msgstr[2] "Инсталирам надградби..."
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Проверувам за надградби..."
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Верзија %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "Вашата дистрибуција повеќе не е поддржана"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1100,81 +1100,85 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+msgid "Add Cdrom"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Проверка"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Преземам промени"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
#, fuzzy
msgid "Import the public key from a trusted software provider"
msgstr "Отстрани го избраниот клуч од доверливиот привезок."
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
#, fuzzy
msgid "Internet Updates"
msgstr "<b>Надградби од интернет</b>"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
#, fuzzy
msgid "Restore _Defaults"
msgstr "Врати стандардно"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
#, fuzzy
msgid "Restore the default keys of your distribution"
msgstr "Врати ги стандардните клучеви"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Софтверски својства"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "Изворен код"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
#, fuzzy
msgid "_Check for updates automatically:"
msgstr "Проверувај за надградби на секои"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
@@ -1559,6 +1563,10 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Инсталирам надградби..."
+
+#, fuzzy
#~ msgid "Important security updates of Ubuntu"
#~ msgstr "Безбедносни надградби за Debian Stable"
diff --git a/po/ms.po b/po/ms.po
index 81a4d520..6c9c8b03 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,48 +88,48 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Kekunci impot"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Ralat semasa mengimpot fail yang dipilih"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Ralat semasa mengeluarkan kekunci"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -140,11 +140,11 @@ msgstr ""
"↵\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Sila masukkan nama untuk cakera padat"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Sila masukkan cakera padat kedalam pemacu"
@@ -387,7 +387,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Pakej-pakej yang telah dipasang ini sudah tidak ada sokonga/bantuan rasmi "
@@ -585,7 +585,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr ""
@@ -810,14 +810,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -854,7 +854,7 @@ msgid "Backports"
msgstr ""
#: ../UpdateManager/UpdateManager.py:240
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
@@ -879,97 +879,97 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
msgid "Checking for updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1104,73 +1104,77 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
-msgid "Authentication"
+msgid "Add Cdrom"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:10
-msgid "D_elete downloaded software files:"
+msgid "Authentication"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:11
-msgid "Download from:"
+msgid "D_elete downloaded software files:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:12
-msgid "Import the public key from a trusted software provider"
+msgid "Download from:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:13
-msgid "Internet Updates"
+msgid "Import the public key from a trusted software provider"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
msgid "Software Sources"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 385b046c..7741c9c1 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,49 +88,49 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Programvareoppdateringer"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "Kilde"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "Kilde"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Importer nøkkel"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Feil under importering av valgt fil"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Kunne ikke fjerne nøkkelen"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -141,11 +141,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Vennligst oppgi et navn for platen"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Vennligst sett inn en plate i CD-spilleren:"
@@ -404,7 +404,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Disse installerte pakkene er ikke lenger offisielt støttet og er nå kun "
@@ -619,7 +619,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Systemet ditt er oppdatert!"
@@ -862,15 +862,15 @@ msgstr ""
"Autentiseringen av oppgraderingen feilet. Det kan være en feil med "
"nettverket eller med tjeneren. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Laster ned filen %li av %li med %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Laster ned fil %li av %li ved ukjent hastighet"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Laster ned filen %li av %li med %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -912,8 +912,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "Installerer oppdateringer"
+msgid "Distribution updates"
+msgstr "_Gjenoppta oppgradering"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -940,75 +940,53 @@ msgstr ""
msgid "_Check All"
msgstr "Sjekk"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Nedlastingsstørrelse: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Vennligst vent, dette kan ta litt tid."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "Oppdateringen er fullført"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Sjekker for tilgjengelige oppdateringer"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Ny versjon: %s (Størrelse: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versjon %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "Din distribusjon er ikke lenger støttet"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 +996,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:845
#, 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:880
msgid "Software index is broken"
msgstr "Programvareoversikten er ødelagt."
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1038,6 +1016,28 @@ msgstr ""
"pakkehåndteringsprogrammet \"Synaptic\" eller kjør kommandoen \"sudo apt-get "
"install -f\" i en terminal for å løse denne situasjonen."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1180,27 +1180,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Legg til _cdrom"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Autentisering"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "Sl_ett nedlastede filer:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Nedlastingen er fullført"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Importer den offentlige nøkkelen fra en tiltrodd programvareutgiver"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Oppdateringer fra Internett"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1208,51 +1213,51 @@ msgstr ""
"Kun sikkerhetsoppdateringer fra de offisielle Ubuntu-tjenerne vil bli "
"installert automatisk."
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "Gjenopprett stan_dardverdier"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Gjenopprett standardnøkler for din distribusjon"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Egenskaper for programvare"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "Kilde"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_Se etter oppdateringer automatisk:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "_Last ned oppdateringer i bakgrunnen, men ikke installér dem"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "_Importer fil med nøkler"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "_Installer sikkerhetsoppdateringer uten bekreftelse"
@@ -1645,6 +1650,13 @@ msgstr "DFSG-kompatiblel programvare med Non-Free avhengigheter"
msgid "Non-DFSG-compatible Software"
msgstr "Ikke-DFSG-kompatibel programvare"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Laster ned fil %li av %li ved ukjent hastighet"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Installerer oppdateringer"
+
#~ msgid "Cancel _Download"
#~ msgstr "Avbryt ne_dlasting"
@@ -1735,9 +1747,6 @@ msgstr "Ikke-DFSG-kompatibel programvare"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Taster</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Legg til _cdrom"
-
#~ msgid "Installation Media"
#~ msgstr "Installasjonsmedia"
diff --git a/po/ne.po b/po/ne.po
index ac11acd6..7b136f19 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -90,48 +90,48 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "सफ्टवेयर अद्यावधिकहरु"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "स्रोत"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "स्रोत"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "चयन गरिएको फाइल आयात गर्दा त्रुटि"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "चयन गरिएको फाइल जिपिजि कुञ्जि फइल नहुन सक्छ अथवा यो दुषित हुन सक्दछ"
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "कुञ्जि हटाउँदा त्रुटि"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -139,11 +139,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -358,7 +358,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -555,7 +555,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
#, fuzzy
msgid "Your system is up-to-date"
msgstr "तपाइं को प्रणालि अप-टु-डेट छ!"
@@ -785,14 +785,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -834,7 +834,7 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
#. TRANSLATORS: updates from an 'unknown' origin
@@ -861,99 +861,99 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, fuzzy, python-format
msgid "Download size: %s"
msgstr "परिवर्तनहरु डाउनलोड गर्दै"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, fuzzy, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "स्तरवृद्धिहरु स्थापना गर्दै"
msgstr[1] "स्तरवृद्धिहरु स्थापना गर्दै"
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "संस्करण %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "तपाईंको वितरण समर्थित छैन"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1086,81 +1086,86 @@ msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
#, fuzzy
+msgid "Add Cdrom"
+msgstr "सिडि थप्नुहोस"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
+#, fuzzy
msgid "Authentication"
msgstr "प्रमाणिकरण"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "परिवर्तनहरु डाउनलोड गर्दै"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
#, fuzzy
msgid "Import the public key from a trusted software provider"
msgstr "विश्वास गरिएको कुञ्जिरिंग बाट चयन गरिएको कुञ्जि हटाउनुहोस"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
#, fuzzy
msgid "Internet Updates"
msgstr "<b>इन्टरनेट अद्यावधिकहरु</b>"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
#, fuzzy
msgid "Restore _Defaults"
msgstr "पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
#, fuzzy
msgid "Restore the default keys of your distribution"
msgstr "पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "सफ्टवेयर गुणहरु"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "स्रोत"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
#, fuzzy
msgid "_Check for updates automatically:"
msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
@@ -1547,6 +1552,10 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
+
+#, fuzzy
#~ msgid "Your system has already been upgraded."
#~ msgstr "तपाईंको प्रणालीमा टुटेका प्याकेजहरु छन!"
@@ -1580,10 +1589,6 @@ msgstr ""
#~ msgstr "<b>विवरणहरु</b>"
#, fuzzy
-#~ msgid "Add _Cdrom"
-#~ msgstr "सिडि थप्नुहोस"
-
-#, fuzzy
#~ msgid "Installation Media"
#~ msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
diff --git a/po/nl.po b/po/nl.po
index 0e2b724b..4ebdacdf 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -87,50 +87,50 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Software-updates"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Sleutel importeren"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Fout bij het importeren van het geselecteerde bestand."
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Fout bij het verwijderen van de sleutel"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -141,11 +141,11 @@ msgstr ""
"↵\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Geef het cd-schijfje een naam"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Plaats een schijf in de speler:"
@@ -408,7 +408,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Deze geïnstalleerde pakketten worden niet meer officieel ondersteund, maar "
@@ -626,7 +626,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Uw systeem is up-to-date"
@@ -866,15 +866,15 @@ msgstr ""
"De echtheidscontrole van de upgrade is mislukt. Er is mogelijk een probleem "
"met het netwerk of de server. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Downloaden van bestand %li uit %li met %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Downloaden van bestand %li uit %li, snelheid onbekend"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Downloaden van bestand %li uit %li met %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -920,8 +920,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "Up_dates installeren"
+msgid "Distribution updates"
+msgstr "_Upgrade hervatten"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -948,75 +948,53 @@ msgstr ""
msgid "_Check All"
msgstr "_Controleren"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Downloadgrootte: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Een ogenblik geduld, dit kan even duren."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "De update is voltooid"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Up_dates installeren"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Nieuwe versie: %s (Grootte: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versie %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "Uw distributie wordt niet langer ondersteund"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 "
@@ -1026,17 +1004,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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr "Software-index is beschadigd"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1046,6 +1024,28 @@ msgstr ""
"Gebruik het pakkettenbeheerprogramma \"Synaptic\" of gebruik \"sudo apt-get "
"install -f\" in een terminalvenster om eerst dit probleem te verhelpen."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1188,27 +1188,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "_CD-rom toevoegen"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Echtheidscontrole"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "Gedownloade softwarebestanden _verwijderen:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Downloaden is voltooid"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Importeer de publieke sleutel van een vertrouwde softwareleverancier"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Internet-updates"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1216,50 +1221,50 @@ msgstr ""
"Alleen veiligheidsupdates van de officiële Ubuntu servers zullen automatisch "
"geïnstalleerd worden"
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "_Standaarden herstellen"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Herstel de standaard sleutels van uw distributie"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Software-eigenschappen"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_Automatisch controleren op aanwezigheid van updates:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "Up_dates wel in de achtergrond downloaden, maar niet installeren"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "Sleutel i_mporteren"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "_Veiligheids-updates zonder te vragen installeren"
@@ -1650,6 +1655,13 @@ msgstr "Software compatibel met DFSG, maar met niet-vrije afhankelijkheden"
msgid "Non-DFSG-compatible Software"
msgstr "Software niet compatibel met DFSG"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Downloaden van bestand %li uit %li, snelheid onbekend"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Up_dates installeren"
+
#~ msgid "Cancel _Download"
#~ msgstr "Download _annuleren"
@@ -1741,9 +1753,6 @@ msgstr "Software niet compatibel met DFSG"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Sleutels</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "_CD-rom toevoegen"
-
#~ msgid "Installation Media"
#~ msgstr "Installatiemedium"
diff --git a/po/no.po b/po/no.po
index 1710e655..3b153941 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -89,49 +89,49 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Programvareoppdateringer"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "Kilde"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "Kilde"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Feil under importering av fil"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Feil under fjerning av nøkkel"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -139,11 +139,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -360,7 +360,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -558,7 +558,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
#, fuzzy
msgid "Your system is up-to-date"
msgstr "Systemet er helt oppdatert!"
@@ -790,14 +790,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -839,7 +839,7 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr "Installerer oppdateringer..."
#. TRANSLATORS: updates from an 'unknown' origin
@@ -866,99 +866,99 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, fuzzy, python-format
msgid "Download size: %s"
msgstr "Laster ned endringer"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Installerer oppdateringer..."
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versjon %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "Din distribusjon er ikke lenger støttet"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1090,81 +1090,86 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Legg til _CD"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Autentisering"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Laster ned endringer"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
#, fuzzy
msgid "Import the public key from a trusted software provider"
msgstr "Fjern den valgte nøkkelen fra den sikre nøkkelringen."
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
#, fuzzy
msgid "Internet Updates"
msgstr "<b>Oppdateringer fra Internett</b>"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
#, fuzzy
msgid "Restore _Defaults"
msgstr "Gjenopprettt forvalgte nøkler"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
#, fuzzy
msgid "Restore the default keys of your distribution"
msgstr "Gjenopprettt forvalgte nøkler"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Egenskaper for programvare"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "Kilde"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
#, fuzzy
msgid "_Check for updates automatically:"
msgstr "Installerer oppdateringer..."
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
@@ -1551,6 +1556,10 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Installerer oppdateringer..."
+
+#, fuzzy
#~ msgid "Your system has already been upgraded."
#~ msgstr "Systemet har ødelagte pakker!"
@@ -1584,10 +1593,6 @@ msgstr ""
#~ msgstr "<b>Detaljer</b>"
#, fuzzy
-#~ msgid "Add _Cdrom"
-#~ msgstr "Legg til _CD"
-
-#, fuzzy
#~ msgid "Installation Media"
#~ msgstr "Installerer oppdateringer..."
diff --git a/po/oc.po b/po/oc.po
index 82b1e6da..0313725c 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+0200\n"
"PO-Revision-Date: 2006-05-29 08:11+0000\n"
"Last-Translator: Yannig MARCHEGAY (Kokoyaya) <yannick.marchegay@lokanova."
"com>\n"
@@ -89,48 +89,48 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Importar clau"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Error al moment d'importar lo fichièr seleccionat"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Error al moment de suprimir la clau"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -141,11 +141,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Picatz un nom pel disc"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Metètz un disc dins lo legidor :"
@@ -357,7 +357,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -551,7 +551,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr ""
@@ -776,14 +776,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -821,7 +821,7 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr "<b>Mesas a jorn per internet</b>"
#. TRANSLATORS: updates from an 'unknown' origin
@@ -848,98 +848,98 @@ msgstr ""
msgid "_Check All"
msgstr "_Verificar"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Talha de la descarga : %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "<b>Mesas a jorn per internet</b>"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Version %s : \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1077,74 +1077,79 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Apondre un CD-ROM"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Talha de la descarga : %s"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
msgid "Software Sources"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
@@ -1507,15 +1512,16 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "<b>Mesas a jorn per internet</b>"
+
+#, fuzzy
#~ msgid "Updates of Ubuntu"
#~ msgstr "Metre a jorn Ubuntu"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Claus</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Apondre un CD-ROM"
-
#~ msgid " "
#~ msgstr " "
diff --git a/po/pa.po b/po/pa.po
index 7a4b7a28..cf757aba 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -89,46 +89,46 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -136,11 +136,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -352,7 +352,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -547,7 +547,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr ""
@@ -775,14 +775,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -822,8 +822,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+msgid "Distribution updates"
+msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -848,98 +848,98 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, fuzzy, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
msgstr[1] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1073,76 +1073,81 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "_CD ਸ਼ਾਮਲ"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "ਪ੍ਰਮਾਣਿਕਤਾ"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
msgid "Download from:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
#, fuzzy
msgid "Internet Updates"
msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "ਸਾਫਟਵੇਅਰ ਪਸੰਦ"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
#, fuzzy
msgid "_Check for updates automatically:"
msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
@@ -1495,6 +1500,10 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#, fuzzy
#~ msgid "Important security updates of Ubuntu"
#~ msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
@@ -1515,10 +1524,6 @@ msgstr ""
#~ msgstr "<b>ਵੇਰਵਾ</b>"
#, fuzzy
-#~ msgid "Add _Cdrom"
-#~ msgstr "_CD ਸ਼ਾਮਲ"
-
-#, fuzzy
#~ msgid "Installation Media"
#~ msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
diff --git a/po/pl.po b/po/pl.po
index d4ac294e..90cf55e8 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,48 +88,48 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Aktualizacje oprogramowania"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "Źródłowy"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "Źródłowy"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Zaimportuj klucz"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Błąd podczas importowania wybranego pliku"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Błąd podczas usuwania klucza"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -140,11 +140,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Proszę podać nazwę dla płyty"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Proszę włożyć płytę do napędu:"
@@ -400,7 +400,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Te zainstalowane pakiety nie są już oficjalnie wspierane, są teraz "
@@ -619,7 +619,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Twój system jest w pełni zaktualizowany"
@@ -860,15 +860,15 @@ msgstr ""
"Uwierzytelnienie aktualizacji nie powiodło się. To może być problem sieciowy "
"lub z serwerem. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Pobieranie pliku %li z %li z prędkością %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Pobieranie pliku %li z %li z nieznaną prędkością"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Pobieranie pliku %li z %li z prędkością %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -910,8 +910,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "Instalowanie pakietów"
+msgid "Distribution updates"
+msgstr "_Wznów aktualizację"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -938,35 +938,13 @@ msgstr ""
msgid "_Check All"
msgstr "Sp_rawdź"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Rozmiar do pobrania: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -974,40 +952,40 @@ msgstr[0] "Ilość dostępnych aktualizacji: %s"
msgstr[1] "Ilość dostępnych aktualizacji: %s"
msgstr[2] "Ilość dostępnych aktualizacji: %s"
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Proszę czekać, to może chwilę potrwać."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "Aktualizacja została ukończona."
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Sprawdź dostępne aktualizacje"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Nowa wersja: %s (Rozmiar: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Wersja %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "Twoja dystrybucja nie jest już wspierana"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 +995,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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr "Spis oprogramowania jest uszkodzony"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1037,6 +1015,28 @@ msgstr ""
"Proszę użyć \"Synaptic Menedżer Pakietów\" lub wydać polecenie \"sudo apt-"
"get install -f\" w terminalu, aby naprawić ten problem."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1180,27 +1180,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Dodaj płytę _CD"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Uwierzytelnianie"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "_Usuń pobrane pliki oprogramowania:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Pobieranie zostało zakończone."
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Zaimportuj publiczny klucz od zaufanego dostawcy oprogramowania"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Aktualizacje internetowe"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1208,51 +1213,51 @@ msgstr ""
"Aktualizacje zabezpieczeń zostaną zainstalowane automatycznie wyłącznie z "
"oficjalnych serwerów Ubuntu"
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "Przywróć _domyślne klucze"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Przywróć domyślne klucze dystrybucji"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Oprogramowanie"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "Źródłowy"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_Sprawdzaj dostępność aktualizacji automatycznie:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "_Pobieraj aktualizacje w tle, ale ich nie instaluj"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "Za_importuj klucz"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "_Instaluj aktualizacje bezpieczeństwa bez potwierdzania"
@@ -1644,6 +1649,13 @@ msgstr "Oprogramowanie kompatybilne z DFSG z zależnościami Non-Free"
msgid "Non-DFSG-compatible Software"
msgstr "Oprogramowanie niekompatybilne z DFSG."
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Pobieranie pliku %li z %li z nieznaną prędkością"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Instalowanie pakietów"
+
#~ msgid "Cancel _Download"
#~ msgstr "_Przerwij pobieranie"
@@ -1736,9 +1748,6 @@ msgstr "Oprogramowanie niekompatybilne z DFSG."
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Klucze</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Dodaj płytę _CD"
-
#~ msgid "Installation Media"
#~ msgstr "Nośnik instalacji"
diff --git a/po/pt.po b/po/pt.po
index 46d36d9f..3767421c 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -86,49 +86,49 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Actualizações de Software"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Importar chave"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Erro ao importar ficheiro seleccionado"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Erro ao remover a chave"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -139,11 +139,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Por favor introduza um nome para o disco"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Por favor introduza um disco no leitor:"
@@ -403,7 +403,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Estes pacotes instalados já não são suportados oficialmente, e agora são "
@@ -621,7 +621,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "O seu sistema está actualizado"
@@ -860,15 +860,15 @@ msgstr ""
"Autenticação da actualização falhou. Poderá existir um problema com a rede "
"ou com o servidor. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "A descarregar ficheiro %li de %li a %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "A descarregar ficheiro %li de %li a velocidade desconhecida"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "A descarregar ficheiro %li de %li a %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -912,8 +912,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "A instalar actualizações"
+msgid "Distribution updates"
+msgstr "_Retomar Actualização?"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -940,75 +940,53 @@ msgstr ""
msgid "_Check All"
msgstr "_Verificar"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Tamanho do download: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Por favor aguarde, isto pode levar algum tempo."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "A actualização está completa"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Verificar por actualizações disponíveis"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Nova versão: %s (Tamanho: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versão %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "A sua distribuição já não é suportada"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 +996,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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr "O índice de software está quebrado"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1038,6 +1016,28 @@ msgstr ""
"gestor de pacotes \"Synaptic\" ou execute \"sudo apt-get install -f\" numa "
"consola para corrigir este problema em primeiro lugar."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1181,27 +1181,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Adicionar _CD"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Autenticação"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "A_pagar ficheiros descarregados:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "O Download está completo"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Importar a chave pública de um fornecedor de software confiável"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Actualizações Internet"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1209,50 +1214,50 @@ msgstr ""
"Apenas actualizações de segurança dos servidores oficiais do Ubuntu serão "
"instaladas automaticamente."
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "Restaurar _Definições"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Restaurar as chaves padrão da sua distribuição"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Preferências de Software"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_Procurar por actualizações automaticamente:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "_Descarregar actualizações silenciosamente, sem as instalar"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "_Importar Chave de Ficheiro"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "_Instalar actualizações de segurança sem confirmação"
@@ -1644,6 +1649,13 @@ msgstr "Software compatível-DFSG com Dependências Não-Livres"
msgid "Non-DFSG-compatible Software"
msgstr "Software compatível-DFSG"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "A descarregar ficheiro %li de %li a velocidade desconhecida"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "A instalar actualizações"
+
#~ msgid "Cancel _Download"
#~ msgstr "Cancelar _Descarregamento"
@@ -1735,9 +1747,6 @@ msgstr "Software compatível-DFSG"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Chaves</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Adicionar _CD"
-
#~ msgid "Installation Media"
#~ msgstr "Media de Instalação"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e58bc03e..fe604df0 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -87,52 +87,52 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Modificando os canais de programas"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "Source"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "Source"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Importar Chave"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Erro importando o arquivo selecionado"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Erro removendo a chave"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -143,11 +143,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Por favor digite um nome para o disco"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Por favor insira um disco no drive:"
@@ -407,7 +407,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Estes pacotes já instalados não são mais oficialmente suportados, e agora "
@@ -622,7 +622,7 @@ msgstr "Para evitar perda de dados, feche todas as aplicações e documentos."
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Seu sistema está atualizado"
@@ -863,15 +863,15 @@ msgstr ""
"Falha ao autenticar a atualização. Pode ter havido um problema com a rede ou "
"com o servidor. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Obtendo arquivo %li de %li a %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Obtendo arquivo %li de %li a uma velocidade desconhecida"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Obtendo arquivo %li de %li a %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -917,8 +917,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "Instalando Atualizações"
+msgid "Distribution updates"
+msgstr "Continua_r Atualização"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -945,75 +945,53 @@ msgstr ""
msgid "_Check All"
msgstr "_Verificar"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Tamanho do download: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Por favor, espere, isto pode levar algum tempo."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "Atualização completa"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Procurar updates disponíveis"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "New version: %s (Tamanho: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Version %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "Sua distribuição não é mais suportada"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 "
@@ -1023,17 +1001,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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr "A índex de software está quebrado"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1043,6 +1021,28 @@ msgstr ""
"Gerenciador de Pacotes \"Synaptic\" ou execute \"sudo apt-get install -f\" "
"em um terminal para resolver esse problema primeiro."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1187,27 +1187,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Adicionar _Cdrom"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Autenticação"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "Apagar arquivos d_e programas obtidos:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "O Download está completo"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Importar a chave pública de um fornecedor de programas confiável"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Atualizações via Internet"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1215,52 +1220,52 @@ msgstr ""
"Somente atualizações de segurança do servidor oficial do Ubuntu serão "
"instaladas automaticamente."
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
#, fuzzy
msgid "Restore _Defaults"
msgstr "Restaurar Pa_drões"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Restaurar as chaves padrão da sua distribuição"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Software Properties"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "Source"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "Verifi_car por atualizações automaticamente:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "_Obter atualizações em segundo plano, mas não instalá-las"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "_Importar Arquivo Chave"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "_Instalar novas atualizações de segurança sem confirmação"
@@ -1653,6 +1658,13 @@ msgstr "Programa compatível com a DFSG mas com dependências não-livres"
msgid "Non-DFSG-compatible Software"
msgstr "Programas não compatíveis com a DFSG"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Obtendo arquivo %li de %li a uma velocidade desconhecida"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Instalando Atualizações"
+
#~ msgid "Cancel _Download"
#~ msgstr "Cancelar _Download"
@@ -1744,9 +1756,6 @@ msgstr "Programas não compatíveis com a DFSG"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Chaves</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Adicionar _Cdrom"
-
#~ msgid "Installation Media"
#~ msgstr "Mídia de Instalação"
diff --git a/po/ro.po b/po/ro.po
index 6deb2735..6329559e 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,53 +88,53 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Actualizări software"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr ""
"Binar\n"
"Sursă"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr ""
"Binar\n"
"Sursă"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
#, fuzzy
msgid "Import key"
msgstr "Importă cheie"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Eroare la importarea fişierului selectat"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Eroare la ştergerea cheii."
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -145,11 +145,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Introduceţi un nume pentru disc"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Introduceţi un disc în unitate:"
@@ -375,7 +375,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -570,7 +570,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Sistemul dumneavoastră este actualizat la zi!"
@@ -797,14 +797,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -848,8 +848,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "_Instalează actualizarile"
+msgid "Distribution updates"
+msgstr "_Continuă Actualizarea"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -875,35 +875,13 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -911,64 +889,86 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "_Instalează actualizarile"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Versiunea nouă: %s (Mărime: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Versiunea %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "Distribuţia dvs. nu mai este suportată"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1109,80 +1109,84 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+msgid "Add Cdrom"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Autentificare"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
msgid "Download from:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
#, fuzzy
msgid "Import the public key from a trusted software provider"
msgstr "Elimină cheia selectată din keyring-ul de încredere."
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Actualizări de pe Internet"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
#, fuzzy
msgid "Restore _Defaults"
msgstr "Restaurează cheile implicite."
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Preferinţe software"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr ""
"Binar\n"
"Sursă"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
#, fuzzy
msgid "_Import Key File"
msgstr "Importă cheie"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
@@ -1566,6 +1570,10 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "_Instalează actualizarile"
+
#~ msgid "Could not find any upgrades"
#~ msgstr "Nu s-au găsit actualizări"
diff --git a/po/ru.po b/po/ru.po
index 07dbd13d..f9e9eced 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -89,47 +89,47 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Обновления программ"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Импортировать ключ"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Ошибка при импортировании выбранного файла"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "Возможно выбранный файл не является файлом ключа GPG или поврежден."
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Ошибка при удалении ключа"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Выбранный вами ключ нельзя удалить. Пожалуйста, отправьте отчет об ошибке."
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -140,11 +140,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Введите название для диска"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Пожалуйста, вставьте диск в привод:"
@@ -401,7 +401,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Эти установленные пакеты больше не поддерживаются официально. Теперь их "
@@ -619,7 +619,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Ваша система не требует обновления"
@@ -857,15 +857,15 @@ msgstr ""
"Проверка подлинности обновления не удалась. Возможно, возникла проблема в "
"сети или на сервере. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Загрузка файла %li из %li со скоростью %s/с"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Загрузка файла %li из %li с неизвестной скоростью"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Загрузка файла %li из %li со скоростью %s/с"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -909,8 +909,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "Установить обновления"
+msgid "Distribution updates"
+msgstr "_Продолжить обновление"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -937,35 +937,13 @@ msgstr ""
msgid "_Check All"
msgstr "Проверить"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Размер загружаемых данных: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -973,40 +951,40 @@ msgstr[0] "Вы можете установить %s обновление"
msgstr[1] "Вы можете установить %s обновления"
msgstr[2] "Вы можете установить %s обновлений"
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Пожалуйста подождите, это может занять некоторое время."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "Обновление завершено"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Установить обновления"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Новая версия: %s (Размер: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Версия %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "Ваша версия Ubuntu больше не поддерживается"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 "
@@ -1016,17 +994,17 @@ msgstr ""
"обновления. Обновите систему до более поздней версии Ubuntu Linux. Для "
"получения информации об обновлении посетите http://www.ubuntu.com"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:845
#, 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:880
msgid "Software index is broken"
msgstr "Индекс программ поврежден"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1036,6 +1014,28 @@ msgstr ""
"используйте менеджер пакетов \"Synaptic\" или запустите в терминале \"sudo "
"apt-get install -f\"."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1178,27 +1178,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Добавить _Cdrom"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Авторизация"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "Удалить загруженные файлы программ:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Загрузка завершена"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Импортировать открытый ключ доверенного поставщика программ"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Обновления в Интернет"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1206,50 +1211,50 @@ msgstr ""
"Автоматически будут установлены только обновления безопасности с официальных "
"серверов Ubuntu"
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "Восстановить начальные"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Восстановить исходные ключи вашего дистрибутива"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Параметры приложений"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "Автоматически проверять наличие обновлений:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "Загружать обновления в фоне, но не устанавливать их"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "Импортировать файл ключа"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "Устанавливать обновления безопасности без запроса"
@@ -1638,6 +1643,13 @@ msgstr "DFSG-совместимое ПО с зависимостями от не
msgid "Non-DFSG-compatible Software"
msgstr "Не-DFSG-совместимое ПО"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Загрузка файла %li из %li с неизвестной скоростью"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Установить обновления"
+
#~ msgid "Cancel _Download"
#~ msgstr "Отменить _загрузку"
@@ -1731,9 +1743,6 @@ msgstr "Не-DFSG-совместимое ПО"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Ключи</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Добавить _Cdrom"
-
#~ msgid "Installation Media"
#~ msgstr "Установочный носитель"
diff --git a/po/rw.po b/po/rw.po
index e643590d..292d629b 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -96,50 +96,50 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Ibihuzagihe bya porogaramumudasobwa"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
#, fuzzy
msgid "Error importing selected file"
msgstr "Kuzaza Byahiswemo IDOSIYE"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
#, 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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
#, fuzzy
msgid "Error removing the key"
msgstr "i Urufunguzo"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
#, 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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -147,11 +147,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -366,7 +366,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -560,7 +560,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
#, fuzzy
msgid "Your system is up-to-date"
msgstr "Sisitemu ni Hejuru Kuri Itariki"
@@ -790,14 +790,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -840,8 +840,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "Kwinjiza porogaramu"
+msgid "Distribution updates"
+msgstr "Byarangiye"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -867,98 +867,98 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Kwinjiza porogaramu"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Verisiyo \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "Ikwirakwiza... ni Oya"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1092,77 +1092,81 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
-msgid "Authentication"
+msgid "Add Cdrom"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:10
-msgid "D_elete downloaded software files:"
+msgid "Authentication"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:11
-msgid "Download from:"
+msgid "D_elete downloaded software files:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:12
+msgid "Download from:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:13
#, fuzzy
msgid "Import the public key from a trusted software provider"
msgstr "i Byahiswemo Urufunguzo Bivuye i"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
#, fuzzy
msgid "Internet Updates"
msgstr "<B B"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
#, fuzzy
msgid "Restore _Defaults"
msgstr "Mburabuzi Utubuto"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Ibihuzagihe bya porogaramumudasobwa"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
@@ -1546,6 +1550,10 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Kwinjiza porogaramu"
+
+#, fuzzy
#~ msgid "Your system has already been upgraded."
#~ msgstr "Sisitemu"
diff --git a/po/sk.po b/po/sk.po
index 7d854094..9cf1a5b6 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,48 +88,48 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Aktualizácie softvéru"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "Zdrojový"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "Zdrojový"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Importovať kľúč"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Chyba pri importovaní vybraného súboru"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Chyba pri odstraňovaní kľúča"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -140,11 +140,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Prosím, zadajte názov disku"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Prosím, vložte disk do mechaniky:"
@@ -399,7 +399,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Tieto nainštalované balíky už viac nie sú oficiálne podporované, ale stará "
@@ -617,7 +617,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Váš systém je aktuálny"
@@ -857,15 +857,15 @@ msgstr ""
"Zlyhalo overenie autenticity aktualizácie. Môže to byť spôsobené sieťovým "
"problémom alebo nedostupňosťou servera. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Sťahovanie súboru %li z %li pri %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Sťahovanie súboru %li z %li pri nezámej rýchlosti"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Sťahovanie súboru %li z %li pri %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -907,8 +907,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "Nainštalovať _aktualizácie"
+msgid "Distribution updates"
+msgstr "_Pokračovať v aktualizácii"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -935,35 +935,13 @@ msgstr ""
msgid "_Check All"
msgstr "_Skontrolovať"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Veľkosť na stiahnutie: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -971,40 +949,40 @@ 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Čakajte prosím, toto môže chvíľu trvať."
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "Aktualizácia je dokončená"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Kontrolujem aktualizácie..."
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Nová verzia: %s (veľkosť: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Verzia %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "Vaša distribúcia už nie je podporovaná"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 "
@@ -1015,17 +993,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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr "Index softvéru je poškodený"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1035,6 +1013,28 @@ msgstr ""
"Na odstránenie tohto problému použite správcu balíkov 'Synaptic' alebo "
"spustite 'sudo apt-get install -f' v termáli."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1178,27 +1178,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Pridať _CD"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Autentifikácia"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "_Zmazať stiahnuté inštalačné balíčky:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Sťahovanie je dokončené"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Importovať verejný kľúč dôveryhodného poskytovateľa softvéru"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Internetové aktualizácie"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1206,51 +1211,51 @@ msgstr ""
"Automaticky budú inštalované iba bezpečnostné aktualizácie z oficiálnych "
"Ubuntu serverov."
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "_Obnoviť predvolené"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Obnoviť pôvodné kľúče distribúcie"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "<b>Zdroje softvéru</b>"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "Zdrojový"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_Kontrolovať aktualizácie:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "_Stiahnuť aktualizácie automaticky, no neinštalovať ich"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "Importovať _kľúč"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "_Bezpečnostné aktualizácie inštalovať automaticky bez potvrdenia"
@@ -1645,6 +1650,13 @@ msgstr "Softvér kompatibilný s DFSG bez závislostí na neslobodnom softvére"
msgid "Non-DFSG-compatible Software"
msgstr "Softvér nekompatibilný s DFSG"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Sťahovanie súboru %li z %li pri nezámej rýchlosti"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Nainštalovať _aktualizácie"
+
#~ msgid "Cancel _Download"
#~ msgstr "_Zrušiť sťahovanie"
@@ -1735,9 +1747,6 @@ msgstr "Softvér nekompatibilný s DFSG"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Kľúče</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Pridať _CD"
-
#~ msgid "Installation Media"
#~ msgstr "Inštalačné média"
diff --git a/po/sr.po b/po/sr.po
index 5545e7b8..b8d0b45e 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -89,45 +89,45 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Importiranje kljuca"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -135,11 +135,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -351,7 +351,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -548,7 +548,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr ""
@@ -772,14 +772,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -816,7 +816,7 @@ msgid "Backports"
msgstr ""
#: ../UpdateManager/UpdateManager.py:240
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
@@ -841,35 +841,13 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -877,62 +855,84 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
msgid "Checking for updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1059,73 +1059,77 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
-msgid "Authentication"
+msgid "Add Cdrom"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:10
-msgid "D_elete downloaded software files:"
+msgid "Authentication"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:11
-msgid "Download from:"
+msgid "D_elete downloaded software files:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:12
-msgid "Import the public key from a trusted software provider"
+msgid "Download from:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:13
-msgid "Internet Updates"
+msgid "Import the public key from a trusted software provider"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
msgid "Software Sources"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index b37ec06b..56dd66ab 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,51 +88,51 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Programvaruuppdateringar"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
#, fuzzy
msgid "Active"
msgstr "Aktivera"
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "Källkod"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "Källkod"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Importera nyckel"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Fel vid importing av vald fil"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Fel vid borttagning av nyckeln"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -143,11 +143,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Skriv in ett namn på skivan"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Sätt in en skiva i enheten:"
@@ -406,7 +406,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"Dessa installerade paket har inte längre officiellt stöd, och är nu enbart "
@@ -618,7 +618,7 @@ msgstr "Stäng alla öppna program och dokument för att undvika dataförlust."
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "Ditt system är uppdaterat"
@@ -864,15 +864,15 @@ msgstr ""
"Autentisering av uppdateringen misslyckades. Det kan vara ett problem med "
"nätverket eller servern. "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Hämtar hem fil %li av %li i %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Hämtar hem fil %li av %li med okänd hastighet"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Hämtar hem fil %li av %li i %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -916,8 +916,8 @@ msgstr "%d uppdateringar"
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "%d uppdateringar"
+msgid "Distribution updates"
+msgstr "Distribution:"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -945,77 +945,53 @@ msgstr "_Uppdatera alla"
msgid "_Check All"
msgstr "_Kontrollera"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-#, fuzzy
-msgid "None"
-msgstr "en"
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-#, fuzzy
-msgid "1 KB"
-msgstr "%d kB"
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, fuzzy, python-format
-msgid "%.0f KB"
-msgstr "%.2f MB"
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, fuzzy, python-format
-msgid "%.1f MB"
-msgstr "%.2f MB"
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "Nerladdningsstorlek: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, 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:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "Var god vänta, det här kan ta lite tid"
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "Uppdateringen är färdig"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Kontrollera efter tillgängliga uppdateringar"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "Ny version: %s (Storlek: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Version %s:"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, fuzzy, python-format
msgid "(Size: %s)"
msgstr "Storlek:"
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "Din distribution stöds inte längre"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 "
@@ -1025,17 +1001,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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr "Indexet för program är trasigt"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -1045,6 +1021,30 @@ msgstr ""
"packethanteraren \"Synaptic\" eller kör \"sudo apt-get install -f\" i en "
"terminal för att rätta till det här problemet först."
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+#, fuzzy
+msgid "None"
+msgstr "en"
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+#, fuzzy
+msgid "1 KB"
+msgstr "%d kB"
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, fuzzy, python-format
+msgid "%.0f KB"
+msgstr "%.2f MB"
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, fuzzy, python-format
+msgid "%.1f MB"
+msgstr "%.2f MB"
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1189,27 +1189,32 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "Lägg till _CD"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Autentisering"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "_Ta bort nerladdade programfiler:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Hämtningslogg"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "Importera den publika nyckeln från en betrodd mjukvaruutgivare"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Internetuppdateringar"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
@@ -1217,52 +1222,52 @@ msgstr ""
"Bara säkerhetsuppdateringar från de officiella Ubuntuservrarna kommer "
"installeras automatiskt"
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "_Återställ standardalternativ"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "Återställ standardnycklarna för din distribution"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
msgid "Software Sources"
msgstr "Programvarukällor"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "Källkod"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
#, fuzzy
msgid "Statistics"
msgstr "Status"
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
#, fuzzy
msgid "Submit statistical information"
msgstr "Hämta användningsinformation"
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "Kolla efter uppdateringar _automatiskt:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "_Hämta uppdateringar i bakgrunden, men installera dem inte"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "_Installera säkerhetsuppdateringar utan bekräftelse"
@@ -1656,6 +1661,13 @@ msgstr "DFSG-kompatibel programvara med icke-fria beroenden"
msgid "Non-DFSG-compatible Software"
msgstr "Inte DFSG-kompatibel programvara"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Hämtar hem fil %li av %li med okänd hastighet"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "%d uppdateringar"
+
#~ msgid "Cancel _Download"
#~ msgstr "Avbryt _nedladdningen"
@@ -1754,9 +1766,6 @@ msgstr "Inte DFSG-kompatibel programvara"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>Nycklar</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "Lägg till _CD"
-
#~ msgid "Installation Media"
#~ msgstr "Installationsmedia"
diff --git a/po/th.po b/po/th.po
index 6fdad89c..d8db8415 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -87,46 +87,46 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "ซอฟต์แวร์ปรับปรุง"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "นำเข้ากุญแจ"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "ไม่สามารถนำเข้าไฟล์ที่เลือกไว้"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "ไฟล์ที่เลือกไว้อาจจะไม่ใช่ GPG กุญแจไฟล์หรืออาจจะเสียหาย"
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "มีปัญหาขณะลบกุจแจ"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "กุญแจที่คุณเลือกไม่สามารถลบออกได้ กรุณารายงานว่าเป็นปัญหา"
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -137,11 +137,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "กรุณาใส่ชื่อสำหรับแผ่นดิสก์"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "กรุณาใส่แผ่นดิสก์เข้าไปในเครื่อง:"
@@ -387,7 +387,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"แพกเกจเหล่านีไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้วและตอนนี้ได้รับสนับสนุนจากชุมชน "
@@ -593,7 +593,7 @@ msgstr "เพื่อป้องกันข้อมูลสูญหาย
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "ระบบของคุณทันสมัยแล้ว"
@@ -822,15 +822,15 @@ msgid ""
"or with the server. "
msgstr "ยืนยันการปรับปรุงไม่สำเร็จ อาจจะมีปัญหาในเครือข่ายหรือที่เซิรฟ์เวอร์ "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li ด้วย %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li โดยไม่ทราบความเร็ว"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li ด้วย %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -871,8 +871,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "_ติดตั้งปรัยปรุง"
+msgid "Distribution updates"
+msgstr "_ปรับปรุงรุ่นต่อจากคราวที่แล้ว"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -899,74 +899,52 @@ msgstr ""
msgid "_Check All"
msgstr "เ_ลือก"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "ขนาดดาวน์โหลด: %s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "คุณสามารถติดตั้ง %s รายการปรับปรุง"
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "กรุณารอสักครู่ นี่อาจจะใช้เวลาสักหน่อย"
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "ปรับปรุงเสร็จสิ้นแล้ว"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "_ติดตั้งปรัยปรุง"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "รุ่นใหม่: %s (ขนาด: %s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "รุ่น %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "ชุดเผยแพร่(distribution)ของคุณไม่มีบริการสนับสนุนแล้ว"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 "
@@ -976,17 +954,17 @@ msgstr ""
"ปรับปรุงขึ้นไปรุ่นถัดไปของอูบันตูลีนุกซ์ กรุณาอ่าน http://www.ubuntu.com "
"สำหรับรายละเอียดเพิ่มเติมในการปรับปรุงรุ่น"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr "ดัชนีของซอฟแวร์เสียหาย"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -995,6 +973,28 @@ msgstr ""
"ไม่สามารถที่จะติดตั้งหรือลบออกซอฟแวร์ใดๆ กรุณาใช้โปรแกรมจัดการแพกเกจ \"Synaptic\" หรือ "
"คำสั่ง \"sudo apt-get install -f\" ในเทอร์มินัลเพื่อที่จะแก้ปัญหานี้ก่อน"
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1135,76 +1135,81 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "เพิ่ม_ซีดีรอม"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "การยืนยันของจริง"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "_ลบซอฟแวร์ไฟล์ที่ดาวน์โหลด:"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "ดาวน์โหลดเสร็จแล้ว"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "นำเข้ากุญแจสาธารณะจากผู้ให้ซอฟแวร์ที่น่าเชื่อถือ"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "ปรัปรุงทางอินเทอร์เน็ต"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr "การปรับปรุงด้านความปลอดภัยจะติดตั้งโดยอัตโนมัติจากเซิรฟ์เวอร์ทางการของอูบันตูเท่านั้น"
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "_คืนค่าปริยาย"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "คืนกุญแจเดืมของชุดเผยแพร่ของคุณ"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "คุณสมบัติของซอฟแวร์"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "_ตรวจหารายการปรับปรุงโดยอัตโนมัติ:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "_ดาวน์โหลดปรับปรุงอยู่เบื้องหลังแต่ยังไม่ต้องติดตั้ง"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "_นำเข้ากุญแจไฟล์"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "_ติดตั้งการปรับปรุงด้านความปลอดภัยโดยไม่ต้องถามก่อน"
@@ -1589,6 +1594,13 @@ msgstr "เข้ากับ DFSG ซอฟแวร์แต่ขึ้นอ
msgid "Non-DFSG-compatible Software"
msgstr "ไม่เข้ากับ DFSG ซอฟแวร์"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li โดยไม่ทราบความเร็ว"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "_ติดตั้งปรัยปรุง"
+
#~ msgid "Cancel _Download"
#~ msgstr "ยกเลิก_ดาวน์โหลด"
@@ -1675,9 +1687,6 @@ msgstr "ไม่เข้ากับ DFSG ซอฟแวร์"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>กุญแจ</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "เพิ่ม_ซีดีรอม"
-
#~ msgid "Installation Media"
#~ msgstr "การติดตั้งมีเดีย"
diff --git a/po/tr.po b/po/tr.po
index f4587c10..eb70d9f4 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,46 +88,46 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Kanal Düzenle"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Anahtar aktar"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Seçili dosyayı aktarmada hata"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Anahtar kaldırmada hata"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -138,11 +138,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Lütfen disk için bir isim girin"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Lütfen sürücüye bir disk yerleştirin:"
@@ -369,7 +369,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -561,7 +561,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr ""
@@ -788,14 +788,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -833,7 +833,7 @@ msgid "Backports"
msgstr ""
#: ../UpdateManager/UpdateManager.py:240
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
@@ -858,96 +858,96 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
msgid "Checking for updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1079,76 +1079,80 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
-msgid "Authentication"
+msgid "Add Cdrom"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:10
-msgid "D_elete downloaded software files:"
+msgid "Authentication"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:11
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "İndirme tamamlandı"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Yazılım Özellikleri"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
#, fuzzy
msgid "_Import Key File"
msgstr "Anahtar aktar"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
diff --git a/po/uk.po b/po/uk.po
index ef1f27c8..00cc865e 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,48 +88,48 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Оновлення програм"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "Текст програми"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "Текст програми"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "Імпортувати ключ"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Помилка імпорту вибраного файлу"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "Вибраний файл, можливо, не є файлом GPG ключа або він пошкоджений."
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Помилка видалення ключа"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку."
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -137,11 +137,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "Введіть назву диску"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "Вставте диск в пристрій:"
@@ -368,7 +368,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -578,7 +578,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
#, fuzzy
msgid "Your system is up-to-date"
msgstr "Ваша система оновлена!"
@@ -816,15 +816,15 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, fuzzy, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Завантажується файл %li of %li at %s/s"
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, fuzzy, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "Завантажується файл %li of %li на невизначенії швидкості"
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Завантажується файл %li of %li at %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -866,8 +866,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "Встановлення оновлень..."
+msgid "Distribution updates"
+msgstr "П_родовжити апгрейд системи"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -893,35 +893,13 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, fuzzy, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
@@ -929,65 +907,87 @@ msgstr[0] "Неможливо провести апргрейд системи"
msgstr[1] "Неможливо провести апргрейд системи"
msgstr[2] "Неможливо провести апргрейд системи"
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
#, fuzzy
msgid "Update is complete"
msgstr "Завантадення пакунків завершено"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Встановлення оновлень..."
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Версія %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "Ваш дистрибутив вже не підтримується"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1121,82 +1121,86 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+msgid "Add Cdrom"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Аутентифікація"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "Завантадення пакунків завершено"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
#, fuzzy
msgid "Import the public key from a trusted software provider"
msgstr "Видалити виділений ключ з в'язки довірених ключів."
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
#, fuzzy
msgid "Internet Updates"
msgstr "<b>Оновлення через Інтернет</b>"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
#, fuzzy
msgid "Restore _Defaults"
msgstr "Відновити початкові параметри"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
#, fuzzy
msgid "Restore the default keys of your distribution"
msgstr "Відновити початкові ключі"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Властивості програм"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "Текст програми"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
#, fuzzy
msgid "_Check for updates automatically:"
msgstr "Перевіряти оновлення кожні"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
#, fuzzy
msgid "_Import Key File"
msgstr "Імпортувати ключ"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
@@ -1583,6 +1587,14 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
+#, fuzzy
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Завантажується файл %li of %li на невизначенії швидкості"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Встановлення оновлень..."
+
#~ msgid "Cancel _Download"
#~ msgstr "Скасувати _Завантаження"
diff --git a/po/update-manager.pot b/po/update-manager.pot
index f054728d..2909b623 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,45 +88,45 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -134,11 +134,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -350,7 +350,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -544,7 +544,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr ""
@@ -768,14 +768,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -812,7 +812,7 @@ msgid "Backports"
msgstr ""
#: ../UpdateManager/UpdateManager.py:240
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
@@ -837,97 +837,97 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
msgid "Checking for updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1054,73 +1054,77 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
-msgid "Authentication"
+msgid "Add Cdrom"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:10
-msgid "D_elete downloaded software files:"
+msgid "Authentication"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:11
-msgid "Download from:"
+msgid "D_elete downloaded software files:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:12
-msgid "Import the public key from a trusted software provider"
+msgid "Download from:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:13
-msgid "Internet Updates"
+msgid "Import the public key from a trusted software provider"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
msgid "Software Sources"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
diff --git a/po/ur.po b/po/ur.po
index d367822b..25649bf5 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,46 +88,46 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
#, fuzzy
msgid "Import key"
msgstr "امپورٹ کی"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -135,11 +135,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -351,7 +351,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -545,7 +545,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr ""
@@ -769,14 +769,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -813,7 +813,7 @@ msgid "Backports"
msgstr ""
#: ../UpdateManager/UpdateManager.py:240
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
@@ -838,97 +838,97 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
msgid "Checking for updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1055,74 +1055,78 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
-msgid "Authentication"
+msgid "Add Cdrom"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:10
-msgid "D_elete downloaded software files:"
+msgid "Authentication"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:11
-msgid "Download from:"
+msgid "D_elete downloaded software files:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:12
-msgid "Import the public key from a trusted software provider"
+msgid "Download from:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:13
-msgid "Internet Updates"
+msgid "Import the public key from a trusted software provider"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
msgid "Software Sources"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
#, fuzzy
msgid "_Import Key File"
msgstr "امپورٹ کی"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
diff --git a/po/urd.po b/po/urd.po
index 03971833..65f63c08 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,46 +88,46 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
msgid "Software Channel"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
#, fuzzy
msgid "Import key"
msgstr "امپورٹ کی"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -135,11 +135,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -351,7 +351,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -545,7 +545,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr ""
@@ -769,14 +769,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -813,7 +813,7 @@ msgid "Backports"
msgstr ""
#: ../UpdateManager/UpdateManager.py:240
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
@@ -838,97 +838,97 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
msgid "Checking for updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1055,74 +1055,78 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
-msgid "Authentication"
+msgid "Add Cdrom"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:10
-msgid "D_elete downloaded software files:"
+msgid "Authentication"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:11
-msgid "Download from:"
+msgid "D_elete downloaded software files:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:12
-msgid "Import the public key from a trusted software provider"
+msgid "Download from:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:13
-msgid "Internet Updates"
+msgid "Import the public key from a trusted software provider"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
msgid "Software Sources"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
#, fuzzy
msgid "_Import Key File"
msgstr "امپورٹ کی"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 652426cb..e42aa10e 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -87,48 +87,48 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Bản cập nhật phần mềm"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "Nguồn"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "Nguồn"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "Gặp lỗi khi nhập tâp tin đã chọn"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
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:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "Gặp lỗi khi gỡ bỏ khóa"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
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:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -136,11 +136,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -355,7 +355,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -549,7 +549,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
#, fuzzy
msgid "Your system is up-to-date"
msgstr "Hệ thống bạn toàn mới nhất."
@@ -779,14 +779,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -830,7 +830,7 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr "Đang cài đặt bản cập nhật..."
#. TRANSLATORS: updates from an 'unknown' origin
@@ -857,98 +857,98 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Đang cài đặt bản cập nhật..."
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "Phiên bản %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
#, 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:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1080,80 +1080,84 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+msgid "Add Cdrom"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "Xác thực"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
msgid "Download from:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
#, fuzzy
msgid "Import the public key from a trusted software provider"
msgstr "Gỡ bỏ khóa được chọn ra vòng khóa tin cây."
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
#, fuzzy
msgid "Internet Updates"
msgstr "<b>Cập nhật dùng Mạng</b>"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
#, fuzzy
msgid "Restore _Defaults"
msgstr "Phục hồi mặc định"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
#, fuzzy
msgid "Restore the default keys of your distribution"
msgstr "Phục hồi các khóa mặc định"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Thuộc tính phần mềm"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "Nguồn"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
#, fuzzy
msgid "_Check for updates automatically:"
msgstr "Kiểm tra có cập nhật sau mỗi"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
@@ -1540,6 +1544,10 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Đang cài đặt bản cập nhật..."
+
+#, fuzzy
#~ msgid "Important security updates of Ubuntu"
#~ msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
diff --git a/po/xh.po b/po/xh.po
index 2c456286..6e7a0566 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -88,46 +88,46 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "Bonisa izihlaziyo"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -135,11 +135,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -351,7 +351,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -545,7 +545,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr ""
@@ -769,14 +769,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -817,7 +817,7 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr "Bonisa izihlaziyo"
#. TRANSLATORS: updates from an 'unknown' origin
@@ -843,98 +843,98 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "Bonisa izihlaziyo"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1064,75 +1064,79 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
-msgid "Authentication"
+msgid "Add Cdrom"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:10
-msgid "D_elete downloaded software files:"
+msgid "Authentication"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:11
-msgid "Download from:"
+msgid "D_elete downloaded software files:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:12
-msgid "Import the public key from a trusted software provider"
+msgid "Download from:"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:13
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:14
#, fuzzy
msgid "Internet Updates"
msgstr "Bonisa izihlaziyo"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
@@ -1483,6 +1487,10 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "Bonisa izihlaziyo"
+
+#, fuzzy
#~ msgid "Important security updates of Ubuntu"
#~ msgstr "Bonisa izihlaziyo"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8069516f..a9a8830d 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -87,52 +87,52 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "软件更新"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr ""
"二进制\n"
"源代码"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr ""
"二进制\n"
"源代码"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "导入密钥"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "在导入所选文件时出错"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "所选文件可能不是GPG密钥文件或者已经损坏."
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "删除密钥时候出错"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "你所选择的密钥不能被删除。请汇报这个bug"
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -143,11 +143,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "请输入光盘的名称"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "请将光盘插入到光驱里:"
@@ -385,7 +385,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
"这些安装的包已不在被官方支持,仅为社区维护('universe').\n"
@@ -589,7 +589,7 @@ msgstr "关闭所有打开的程序和文档以防止数据丢失。"
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "您的系统已为最新"
@@ -817,15 +817,15 @@ msgid ""
"or with the server. "
msgstr "认证升级信息失败。可能是网络或服务器的问题。 "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "正在下载文件 %li/%li 速度是 %s/s"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "正在下载文件 %li/%li 速度未知"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "正在下载文件 %li/%li 速度是 %s/s"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -865,8 +865,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "安装更新"
+msgid "Distribution updates"
+msgstr "继续升级(_R)"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -893,74 +893,52 @@ msgstr ""
msgid "_Check All"
msgstr "检查(_C)"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "下载文件大小:%s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "你可以安装 %s 个更新"
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "请稍等,这需要花一些时间。"
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "更新完成"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "检查有效的更新"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "新版本:%s(大小:%s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "版本 %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "您的发行版不再被支持"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 "
@@ -970,17 +948,17 @@ msgstr ""
"\r\n"
"http://www.ubuntu.com 来获取更多有关升级的信息。"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:845
#, 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:880
msgid "Software index is broken"
msgstr "软件索引已被破坏"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -989,6 +967,28 @@ msgstr ""
"无法安装或删除任何软件。请使用包管理软件\"synaptic\"或在终端运行\"sudo apt-"
"get install -f\"来修正这个问题。"
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1129,79 +1129,84 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "添加 CDrom(_C)"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "身份验证"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "删除下载的软件文件(_e)"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "下载完成"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "从信任的密钥环中删除选中的密钥。"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "Internet 更新"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr "只有来自官方Ubuntu服务器的安全更新才会被自动安装。"
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "恢复默认值(_D)"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "还原为发行版本预设的密钥"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "软件属性"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr ""
"二进制\n"
"源代码"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "自动检查更新(_C)"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "在后台下载更新,但是不安装(_D)"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "导入密钥(_I)"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "不确认就安装安全更新(_I)"
@@ -1591,6 +1596,13 @@ msgstr "带有非自由依赖关系的DFSG兼容软件"
msgid "Non-DFSG-compatible Software"
msgstr "非DFSG兼容软件"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "正在下载文件 %li/%li 速度未知"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "安装更新"
+
#~ msgid "Cancel _Download"
#~ msgstr "取消下载(_D)"
@@ -1675,9 +1687,6 @@ msgstr "非DFSG兼容软件"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>密钥</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "添加 CDrom(_C)"
-
#~ msgid "Installation Media"
#~ msgstr "安装媒体"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 36f91802..29847de7 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -87,48 +87,48 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "軟件更新"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
#, fuzzy
msgid "(Source Code)"
msgstr "源程式碼"
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
#, fuzzy
msgid "Source Code"
msgstr "源程式碼"
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "匯入指定檔案時發生錯誤"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "選定的檔案可能不是 GPG 密碼匙,或者內容已損壞。"
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "移除密碼匙時發生錯誤"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "你選定的密碼匙無法移除,請匯報問題。"
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -136,11 +136,11 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr ""
@@ -355,7 +355,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -552,7 +552,7 @@ msgstr ""
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
#, fuzzy
msgid "Your system is up-to-date"
msgstr "系統已經在最新狀態!"
@@ -782,14 +782,14 @@ msgid ""
"or with the server. "
msgstr ""
-#: ../UpdateManager/GtkProgress.py:107
+#: ../UpdateManager/GtkProgress.py:108
#, python-format
-msgid "Downloading file %li of %li with %s/s"
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:111
+#: ../UpdateManager/GtkProgress.py:113
#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+msgid "Downloading file %(current)li of %(total)li"
msgstr ""
#: ../UpdateManager/UpdateManager.py:204
@@ -831,7 +831,7 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
+msgid "Distribution updates"
msgstr "正在安裝軟件更新..."
#. TRANSLATORS: updates from an 'unknown' origin
@@ -858,99 +858,99 @@ msgstr ""
msgid "_Check All"
msgstr ""
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "正在安裝軟件更新..."
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "版本 %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
#, fuzzy
msgid "Your distribution is not supported anymore"
msgstr "已經不再支援你用的發行版本"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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:845
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:897
+#: ../UpdateManager/UpdateManager.py:880
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
"this issue at first."
msgstr ""
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
msgid ""
"<b><big>You must check for updates manually</big></b>\n"
@@ -1082,80 +1082,84 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+msgid "Add Cdrom"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "認證"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
msgid "Download from:"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
#, fuzzy
msgid "Import the public key from a trusted software provider"
msgstr "由你信任的密碼匙圈中移除指定的密碼匙。"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
#, fuzzy
msgid "Internet Updates"
msgstr "<b>線上更新</b>"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
#, fuzzy
msgid "Restore _Defaults"
msgstr "還原為預設值"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
#, fuzzy
msgid "Restore the default keys of your distribution"
msgstr "還原為預設密碼匙"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "軟件屬性"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
#, fuzzy
msgid "Source code"
msgstr "源程式碼"
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
#, fuzzy
msgid "_Check for updates automatically:"
msgstr "檢查軟件更新間隔:"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
msgid "_Download updates automatically, but do not install them"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr ""
@@ -1541,6 +1545,10 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "正在安裝軟件更新..."
+
+#, fuzzy
#~ msgid "Important security updates of Ubuntu"
#~ msgstr "Ubuntu 5.10 安全性更新"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3f894738..2c0cd116 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-27 11:08+0200\n"
+"POT-Creation-Date: 2006-09-29 17:00+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"
@@ -86,46 +86,46 @@ msgstr ""
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:601
-#: ../SoftwareProperties/SoftwareProperties.py:618
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
#, fuzzy
msgid "Software Channel"
msgstr "軟體更新"
-#: ../SoftwareProperties/SoftwareProperties.py:609
-#: ../SoftwareProperties/SoftwareProperties.py:626
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
msgid "Active"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:711
+#: ../SoftwareProperties/SoftwareProperties.py:714
msgid "(Source Code)"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:717
+#: ../SoftwareProperties/SoftwareProperties.py:720
msgid "Source Code"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:966
+#: ../SoftwareProperties/SoftwareProperties.py:969
msgid "Import key"
msgstr "匯入金鑰"
-#: ../SoftwareProperties/SoftwareProperties.py:976
+#: ../SoftwareProperties/SoftwareProperties.py:979
msgid "Error importing selected file"
msgstr "匯入指定檔案時發生錯誤"
-#: ../SoftwareProperties/SoftwareProperties.py:977
+#: ../SoftwareProperties/SoftwareProperties.py:980
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "選定的檔案可能不是 GPG 金鑰,或者內容已損壞。"
-#: ../SoftwareProperties/SoftwareProperties.py:989
+#: ../SoftwareProperties/SoftwareProperties.py:992
msgid "Error removing the key"
msgstr "移除金鑰時發生錯誤"
-#: ../SoftwareProperties/SoftwareProperties.py:990
+#: ../SoftwareProperties/SoftwareProperties.py:993
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "您選定的金鑰無法移除,請匯報問題。"
-#: ../SoftwareProperties/SoftwareProperties.py:1036
+#: ../SoftwareProperties/SoftwareProperties.py:1039
#, fuzzy, python-format
msgid ""
"<big><b>Error scanning the CD</b></big>\n"
@@ -136,11 +136,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1093
+#: ../SoftwareProperties/SoftwareProperties.py:1096
msgid "Please enter a name for the disc"
msgstr "請輸入光碟的名稱"
-#: ../SoftwareProperties/SoftwareProperties.py:1109
+#: ../SoftwareProperties/SoftwareProperties.py:1112
msgid "Please insert a disc in the drive:"
msgstr "請將光碟放入光碟機:"
@@ -379,7 +379,7 @@ msgid ""
"Canonical Ltd. no longer provides support for the following software "
"packages. You can still get support from the community.\n"
"\n"
-"If you havn't enabled community maintained software (universe), these "
+"If you have not enabled community maintained software (universe), these "
"packages will be suggested for removal in the next step."
msgstr ""
@@ -581,7 +581,7 @@ msgstr "避免遺失請關閉所有已開啟的程式及文件。"
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:621
+#: ../UpdateManager/UpdateManager.py:604
msgid "Your system is up-to-date"
msgstr "系統已經在最新狀態"
@@ -810,15 +810,15 @@ msgid ""
"or with the server. "
msgstr "認證升級套件失敗。可能是因為跟伺服器的網路連線出現問題。 "
-#: ../UpdateManager/GtkProgress.py:107
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../UpdateManager/GtkProgress.py:108
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "正在下載檔案 %li/%li,下載速度為 %s/秒"
-#: ../UpdateManager/GtkProgress.py:111
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
-msgstr "正在下載檔案 %li/%li,下載速度不明"
+#: ../UpdateManager/GtkProgress.py:113
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "正在下載檔案 %li/%li,下載速度為 %s/秒"
#: ../UpdateManager/UpdateManager.py:204
#, fuzzy
@@ -858,8 +858,8 @@ msgstr ""
#: ../UpdateManager/UpdateManager.py:240
#, fuzzy
-msgid "Normal updates"
-msgstr "安裝更新套件(_I)"
+msgid "Distribution updates"
+msgstr "繼續升級(_R)"
#. TRANSLATORS: updates from an 'unknown' origin
#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
@@ -886,75 +886,53 @@ msgstr ""
msgid "_Check All"
msgstr "檢查(_C)"
-#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:585
-msgid "None"
-msgstr ""
-
-#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:588
-msgid "1 KB"
-msgstr ""
-
-#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:591
-#, python-format
-msgid "%.0f KB"
-msgstr ""
-
-#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:594
-#, python-format
-msgid "%.1f MB"
-msgstr ""
-
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:612 ../UpdateManager/UpdateManager.py:636
+#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
#, python-format
msgid "Download size: %s"
msgstr "下載大小:%s"
-#: ../UpdateManager/UpdateManager.py:632
+#: ../UpdateManager/UpdateManager.py:615
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "您可以安裝 %s 個更新"
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:648
msgid "Please wait, this can take some time."
msgstr "請稍候,這可能需要一點時間。"
-#: ../UpdateManager/UpdateManager.py:667
+#: ../UpdateManager/UpdateManager.py:650
msgid "Update is complete"
msgstr "更新完成"
-#: ../UpdateManager/UpdateManager.py:718
+#: ../UpdateManager/UpdateManager.py:701
#, fuzzy
msgid "Checking for updates"
msgstr "安裝更新套件(_I)"
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:808
#, fuzzy, python-format
-msgid "From version %s to %s"
+msgid "From version %(old_version)s to %(new_version)s"
msgstr "新版本:%s (大小:%s)"
-#: ../UpdateManager/UpdateManager.py:829
+#: ../UpdateManager/UpdateManager.py:812
#, fuzzy, python-format
msgid "Version %s"
msgstr "版本 %s: \n"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:831
+#: ../UpdateManager/UpdateManager.py:814
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:842
+#: ../UpdateManager/UpdateManager.py:825
msgid "Your distribution is not supported anymore"
msgstr "您正使用的發行版本已不再支援"
-#: ../UpdateManager/UpdateManager.py:843
+#: ../UpdateManager/UpdateManager.py:826
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 "
@@ -963,17 +941,17 @@ msgstr ""
"您不會再取得任何安全或重大更新,請升級到最新版本的 Ubuntu Linux。請參閱 "
"http://www.ubuntu.com以取得更多升級資訊。"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:845
#, 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:880
msgid "Software index is broken"
msgstr "軟體索引損壞"
-#: ../UpdateManager/UpdateManager.py:898
+#: ../UpdateManager/UpdateManager.py:881
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 "
@@ -982,6 +960,28 @@ msgstr ""
"不能安裝或移除任何套件。請先使用套件管理程式“Synaptic”或在終端機中執行“sudo "
"apt-get install -f”來修正問題。"
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
#: ../data/glade/UpdateManager.glade.h:1
#, fuzzy
msgid ""
@@ -1121,76 +1121,81 @@ msgid ""
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Add Cdrom"
+msgstr "加入光碟(_C)"
+
+#: ../data/glade/SoftwareProperties.glade.h:10
msgid "Authentication"
msgstr "認證"
-#: ../data/glade/SoftwareProperties.glade.h:10
+#: ../data/glade/SoftwareProperties.glade.h:11
msgid "D_elete downloaded software files:"
msgstr "刪除已下載的軟體檔案(_E):"
-#: ../data/glade/SoftwareProperties.glade.h:11
+#: ../data/glade/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Download from:"
msgstr "下載完成"
-#: ../data/glade/SoftwareProperties.glade.h:12
+#: ../data/glade/SoftwareProperties.glade.h:13
msgid "Import the public key from a trusted software provider"
msgstr "匯入您信任的軟體供應商的公鑰"
-#: ../data/glade/SoftwareProperties.glade.h:13
+#: ../data/glade/SoftwareProperties.glade.h:14
msgid "Internet Updates"
msgstr "線上更新"
-#: ../data/glade/SoftwareProperties.glade.h:14
+#: ../data/glade/SoftwareProperties.glade.h:15
msgid ""
"Only security updates from the official Ubuntu servers will be installed "
"automatically"
msgstr "只有來自 Ubuntu 官方伺服器的安全性更新會自動安裝"
-#: ../data/glade/SoftwareProperties.glade.h:15
+#: ../data/glade/SoftwareProperties.glade.h:16
msgid "Restore _Defaults"
msgstr "還原為預設值(_D)"
-#: ../data/glade/SoftwareProperties.glade.h:16
+#: ../data/glade/SoftwareProperties.glade.h:17
msgid "Restore the default keys of your distribution"
msgstr "還原為發行版本預設的金鑰"
-#: ../data/glade/SoftwareProperties.glade.h:17
+#: ../data/glade/SoftwareProperties.glade.h:18
#: ../data/software-properties.desktop.in.h:2
#, fuzzy
msgid "Software Sources"
msgstr "軟體屬性"
-#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/glade/SoftwareProperties.glade.h:19
msgid "Source code"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:19
+#: ../data/glade/SoftwareProperties.glade.h:20
msgid "Statistics"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:20
+#: ../data/glade/SoftwareProperties.glade.h:21
msgid "Submit statistical information"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:21
+#: ../data/glade/SoftwareProperties.glade.h:22
msgid "Third Party"
msgstr ""
-#: ../data/glade/SoftwareProperties.glade.h:22
+#: ../data/glade/SoftwareProperties.glade.h:23
msgid "_Check for updates automatically:"
msgstr "自動檢查更新(_C):"
-#: ../data/glade/SoftwareProperties.glade.h:23
+#: ../data/glade/SoftwareProperties.glade.h:24
#, fuzzy
msgid "_Download updates automatically, but do not install them"
msgstr "在背景下載更新套件,但無須安裝(_D)"
-#: ../data/glade/SoftwareProperties.glade.h:24
+#: ../data/glade/SoftwareProperties.glade.h:25
msgid "_Import Key File"
msgstr "匯入金鑰"
-#: ../data/glade/SoftwareProperties.glade.h:25
+#: ../data/glade/SoftwareProperties.glade.h:26
msgid "_Install security updates without confirmation"
msgstr "無須確認便安裝安全性更新(_I)"
@@ -1576,6 +1581,13 @@ msgstr "符合 DFSG 的軟體,但有依賴於非自由軟體"
msgid "Non-DFSG-compatible Software"
msgstr "不符合 DFSG 的軟體"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "正在下載檔案 %li/%li,下載速度不明"
+
+#, fuzzy
+#~ msgid "Normal updates"
+#~ msgstr "安裝更新套件(_I)"
+
#~ msgid "Cancel _Download"
#~ msgstr "取消下載(_D)"
@@ -1658,9 +1670,6 @@ msgstr "不符合 DFSG 的軟體"
#~ msgid "<b>Keys</b>"
#~ msgstr "<b>金鑰</b>"
-#~ msgid "Add _Cdrom"
-#~ msgstr "加入光碟(_C)"
-
#~ msgid "Installation Media"
#~ msgstr "安裝媒體"