summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-02-08 21:14:54 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2006-02-08 21:14:54 +0100
commit29d66908e881a0ffdacb63db33a7932858429e54 (patch)
tree44318c2a9d41dd707f396a3d0ad9c3d8d1d87c02
parent9d74de48fff54b378bf09544ca1f3a41ca33d88d (diff)
downloadpython-apt-29d66908e881a0ffdacb63db33a7932858429e54.tar.gz
* make update-po
-rw-r--r--po/da.po325
-rw-r--r--po/de.po334
-rw-r--r--po/el.po290
-rw-r--r--po/en_CA.po331
-rw-r--r--po/es.po331
-rw-r--r--po/fi.po328
-rw-r--r--po/fr.po331
-rw-r--r--po/hu.po331
-rw-r--r--po/ja.po333
-rw-r--r--po/pl.po331
-rw-r--r--po/pt_BR.po285
-rw-r--r--po/ro.po323
-rw-r--r--po/rw.po325
-rw-r--r--po/sv.po353
-rw-r--r--po/xh.po286
-rw-r--r--po/zh_CN.po323
16 files changed, 3008 insertions, 2152 deletions
diff --git a/po/da.po b/po/da.po
index 9899c330..5d2f98c7 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: \n"
-"POT-Creation-Date: 2006-01-26 15:51+0100\n"
+"POT-Creation-Date: 2006-02-08 21:14+0100\n"
"PO-Revision-Date: 2005-03-28 11:31+0200\n"
"Last-Translator: Martin Willemoes Hansen <mwh@sysrq.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -18,18 +18,18 @@ msgstr ""
#: ../data/SoftwareProperties.glade.h:1
#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Internet-opdateringer</b>"
+msgid "<b>Channels</b>"
+msgstr "<b>Detaljer</b>"
#: ../data/SoftwareProperties.glade.h:2
#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Detaljer</b>"
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet-opdateringer</b>"
#: ../data/SoftwareProperties.glade.h:3
#, fuzzy
-msgid "<b>Sources</b>"
-msgstr "<b>Programmelkilder</b>"
+msgid "<b>Keys</b>"
+msgstr "<b>Detaljer</b>"
#: ../data/SoftwareProperties.glade.h:4
#, fuzzy
@@ -42,9 +42,8 @@ msgid "Authentication"
msgstr "_Godkendelse"
#: ../data/SoftwareProperties.glade.h:6
-#, fuzzy
-msgid "Automatically check for updates"
-msgstr "Kontrollér om der er nye opdateringer automatisk."
+msgid "D_elete downloaded software files:"
+msgstr ""
#: ../data/SoftwareProperties.glade.h:7
#, fuzzy
@@ -57,35 +56,56 @@ msgstr ""
#: ../data/SoftwareProperties.glade.h:9
#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Internet-opdateringer</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+#, fuzzy
msgid "Restore _Defaults"
msgstr "Genopret de forvalgte nøgler"
-#: ../data/SoftwareProperties.glade.h:10
+#: ../data/SoftwareProperties.glade.h:11
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/SoftwareProperties.glade.h:11
+#: ../data/SoftwareProperties.glade.h:12
msgid "Software Preferences"
msgstr "Indstillinger"
-#: ../data/SoftwareProperties.glade.h:12
-msgid ""
-"daily\n"
-"every two days\n"
-"weekly\n"
-"every two weeks\n"
-"custom"
+#: ../data/SoftwareProperties.glade.h:13
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Install new updates without confirmation"
msgstr ""
#: ../data/UpdateManager.glade.h:1
-msgid "<big><b>Install software updates</b></big>"
+msgid ""
+"<b><big>You need to manually reload the latest information about updates</"
+"big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
msgstr ""
-#: ../data/UpdateManager.glade.h:2
-msgid "<big><b>Reading package information</b></big>"
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:3
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:8
msgid ""
"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
"\n"
@@ -95,57 +115,60 @@ msgstr ""
"\n"
"Skal hente ændringerne fra den centrale server"
-#: ../data/UpdateManager.glade.h:6
-#, fuzzy
-msgid "Cancel downloading of the changelog"
-msgstr "Afbryd overførsel af ændringsloggen"
+#: ../data/UpdateManager.glade.h:11
+msgid "Cancel _Download"
+msgstr ""
-#: ../data/UpdateManager.glade.h:7
+#: ../data/UpdateManager.glade.h:12
msgid "Changes"
msgstr "Ændringer"
-#: ../data/UpdateManager.glade.h:8
+#: ../data/UpdateManager.glade.h:13
msgid "Description"
msgstr "Beskrivelse"
-#: ../data/UpdateManager.glade.h:9
-msgid ""
-"Reading information about the installed packages. Depending on the speed of "
-"your computer this may take a bit."
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:14
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:15
+#, fuzzy
+msgid "Reload the latest information about updates"
+msgstr "Genindlæs pakkeinformationen fra serveren."
+
+#: ../data/UpdateManager.glade.h:16
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:17
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:18
msgid "Software Updates"
msgstr "Opdateringer"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:19
msgid ""
-"Software updates can fix possible security holes, fix possible errors, so "
-"called \"bugs\", or provide new features to you."
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "U_pgrade"
msgstr "Opgradering færdig"
-#: ../data/UpdateManager.glade.h:16
-msgid "_Install"
+#: ../data/UpdateManager.glade.h:21
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:22
+#, fuzzy
+msgid "_Install Updates"
msgstr "_Installér"
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:23
#, fuzzy
msgid "_Reload"
msgstr "Genindlæs"
@@ -158,13 +181,15 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Breezy 6.04 \"Dapper Drake\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Breezy 5.10 \"Breezy Badger\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
#. Description
#: ../channels/Ubuntu.info.in:40
@@ -258,27 +283,37 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:237
-msgid "Choose a key-file"
+#: ../SoftwareProperties/SoftwareProperties.py:102
+#, python-format
+msgid "Every %s days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:247
+#: ../SoftwareProperties/SoftwareProperties.py:132
+#, python-format
+msgid "After %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:330
+msgid "Import key"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:340
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:248
+#: ../SoftwareProperties/SoftwareProperties.py:341
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:260
+#: ../SoftwareProperties/SoftwareProperties.py:353
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:261
+#: ../SoftwareProperties/SoftwareProperties.py:354
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:304
+#: ../SoftwareProperties/SoftwareProperties.py:397
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -286,72 +321,72 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:354
+#: ../SoftwareProperties/SoftwareProperties.py:447
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:463
msgid "Please insert a disc in the drive:"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:87
+#: ../DistUpgrade/DistUpgradeCache.py:92
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:88
+#: ../DistUpgrade/DistUpgradeCache.py:93
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:101
+#: ../DistUpgrade/DistUpgradeCache.py:135
msgid "Can't upgrade required meta-packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:103
+#: ../DistUpgrade/DistUpgradeCache.py:142
msgid "A essential package would have to be removed"
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:106
+#: ../DistUpgrade/DistUpgradeCache.py:145
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:107
+#: ../DistUpgrade/DistUpgradeCache.py:146
msgid ""
"A unresolvable problem occured while calculating the upgrade. Please report "
"this as a bug. "
msgstr ""
#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:129
+#: ../DistUpgrade/DistUpgradeCache.py:168
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:130
+#: ../DistUpgrade/DistUpgradeCache.py:169
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:232
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:194
+#: ../DistUpgrade/DistUpgradeCache.py:233
msgid ""
"It was impossible to install a required package. Please report this as a "
"bug. "
msgstr ""
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:201
+#: ../DistUpgrade/DistUpgradeCache.py:240
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:202
+#: ../DistUpgrade/DistUpgradeCache.py:241
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
"desktop package and it was not possible to detect which version of ubuntu "
@@ -365,79 +400,79 @@ msgid "Reading cache"
msgstr ""
#. FIXME: offer to write a new self.sources.list entry
-#: ../DistUpgrade/DistUpgradeControler.py:113
+#: ../DistUpgrade/DistUpgradeControler.py:107
msgid "No valid entry found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:114
+#: ../DistUpgrade/DistUpgradeControler.py:108
msgid ""
"While scaning your repository information no valid entry for the upgrade was "
"found.\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:129
+#: ../DistUpgrade/DistUpgradeControler.py:125
msgid "Repository information invalid"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:130
+#: ../DistUpgrade/DistUpgradeControler.py:126
msgid ""
"Upgrading the repository information resulted in a invalid file. Please "
"report this as a bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:166
+#: ../DistUpgrade/DistUpgradeControler.py:171
msgid "Error during update"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:172
msgid ""
"A problem occured during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:186
+#: ../DistUpgrade/DistUpgradeControler.py:190
msgid "Not enough free space"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:187
+#: ../DistUpgrade/DistUpgradeControler.py:191
msgid ""
"There is not enough free space on your system to download the required "
"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
"clean'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:192
+#: ../DistUpgrade/DistUpgradeControler.py:196
#, fuzzy
msgid "Perform Upgrade?"
msgstr "Opgradering færdig"
#. installing the packages failed, can't be retried
-#: ../DistUpgrade/DistUpgradeControler.py:206
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:280
msgid "Error during commit"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:207
+#: ../DistUpgrade/DistUpgradeControler.py:212
msgid ""
"Some problem occured during the upgrade. Most likely packages failed to "
"install. Try 'sudo apt-get install -f' or synaptic to fix your system."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:223
+#: ../DistUpgrade/DistUpgradeControler.py:228
msgid "Error fetching the packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:224
+#: ../DistUpgrade/DistUpgradeControler.py:229
msgid ""
"Some problem occured during the fetching of the packages. This is most "
"likely a network problem. Please check your network and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:273
msgid "Remove obsolete Packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:264
+#: ../DistUpgrade/DistUpgradeControler.py:281
msgid ""
"Some problem occured during the clean-up. Please see the below message for "
"more information. "
@@ -445,50 +480,54 @@ msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:279
-#: ../DistUpgrade/DistUpgradeControler.py:298
-msgid "Checking update system"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:295
+#: ../DistUpgrade/DistUpgradeControler.py:318
+#, fuzzy
+msgid "Checking package manager"
+msgstr "En anden pakkehåndtering er i gang"
-#: ../DistUpgrade/DistUpgradeControler.py:290
+#: ../DistUpgrade/DistUpgradeControler.py:310
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:324
msgid "Asking for confirmation"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:308
+#: ../DistUpgrade/DistUpgradeControler.py:328
#, fuzzy
msgid "Upgrading"
msgstr "Opgradering færdig"
-#: ../DistUpgrade/DistUpgradeControler.py:315
+#: ../DistUpgrade/DistUpgradeControler.py:335
msgid "Searching for obsolete software"
msgstr ""
-#. done, ask for reboot
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:340
msgid "System upgrade is complete."
msgstr ""
#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:70
+#: ../DistUpgrade/DistUpgradeViewGtk.py:76
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#: ../DistUpgrade/DistUpgradeViewGtk.py:94
+msgid "Download is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:105
#, python-format
msgid "Downloading file %li of %li with %s/s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:101
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
#, python-format
msgid "%s remaining"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:103
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
#, python-format
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
@@ -496,33 +535,31 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:126
-msgid "Installing updates ..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:131
+msgid "Installing updates"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:139
+#: ../DistUpgrade/DistUpgradeViewGtk.py:144
#, python-format
-msgid "Error installing '%s'"
+msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
-msgid ""
-"During the install a error occured. This is usually a bug in the packages, "
-"please report it. See the message below for more information. "
+#: ../DistUpgrade/DistUpgradeViewGtk.py:145
+msgid "The upgrade will abort. Please report the bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:224
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:225
+#: ../DistUpgrade/DistUpgradeViewGtk.py:217
msgid ""
"During the operation a fatal error occured. Please report this as a bug and "
"include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your "
"report. The upgrade will abort now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:305
+#: ../DistUpgrade/DistUpgradeViewGtk.py:293
#, python-format
msgid ""
"%s packages are going to be removed.\n"
@@ -532,37 +569,37 @@ msgid ""
"%s needs to be fetched"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:316
+#: ../DistUpgrade/DistUpgradeViewGtk.py:304
#, python-format
msgid "<b>To be removed: %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:318
+#: ../DistUpgrade/DistUpgradeViewGtk.py:306
#, python-format
msgid "To be installed: %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:308
#, python-format
msgid "To be upgraded: %s"
msgstr ""
#. print "on_window_main_delete_event()"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:351
+#: ../DistUpgrade/DistUpgradeViewGtk.py:339
msgid "Are you sure you want cancel?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:340
msgid ""
"Canceling during a upgrade can leave the system in a unstable state. It is "
"strongly adviced to continue the operation. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:67
msgid "Reboot required"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
"The upgrade is finished now. A reboot is required to now, do you want to do "
"this now?"
@@ -581,43 +618,65 @@ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:3
+msgid "<b><big>Start the upgrade?</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:4
#, fuzzy
-msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
+"span>"
msgstr "<span weight=\"bold\" size=\"larger\">Arkiver er ændret</span>"
-#: ../DistUpgrade/DistUpgrade.glade.h:4
+#: ../DistUpgrade/DistUpgrade.glade.h:5
msgid "Cleaning up"
msgstr ""
-#: ../DistUpgrade/DistUpgrade.glade.h:5
+#: ../DistUpgrade/DistUpgrade.glade.h:6
#, fuzzy
msgid "Details"
msgstr "<b>Detaljer</b>"
-#: ../DistUpgrade/DistUpgrade.glade.h:6
-msgid "Preparing upgrade"
-msgstr ""
-
#: ../DistUpgrade/DistUpgrade.glade.h:7
-msgid "Terminal"
+msgid "Downloading and installing the upgrades"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:8
-msgid "Upgrading Ubuntu"
+msgid "Modifing the software channels"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:9
-msgid "Upgrading software channels"
+msgid "Preparing the upgrade"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Upgrading the system"
+msgid "Terminal"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
msgid "_Restart Now"
msgstr ""
+#, fuzzy
+#~ msgid "<b>Sources</b>"
+#~ msgstr "<b>Programmelkilder</b>"
+
+#, fuzzy
+#~ msgid "Automatically check for updates"
+#~ msgstr "Kontrollér om der er nye opdateringer automatisk."
+
+#, fuzzy
+#~ msgid "Cancel downloading of the changelog"
+#~ msgstr "Afbryd overførsel af ændringsloggen"
+
#~ msgid "<b>Packages to install:</b>"
#~ msgstr "<b>Pakker der skal installeres:</b>"
@@ -806,9 +865,6 @@ msgstr ""
#~ msgid "The updates are being applied."
#~ msgstr "Opdateringerne bliver installeret."
-#~ msgid "Another package manager is running"
-#~ msgstr "En anden pakkehåndtering er i gang"
-
#~ msgid ""
#~ "You can run only one package management application at the same time. "
#~ "Please close this other application first."
@@ -868,9 +924,6 @@ msgstr ""
#~ msgid "Ubuntu Update Manager"
#~ msgstr "Ubuntus opdateringsværktøj"
-#~ msgid "Reload the package information from the server."
-#~ msgstr "Genindlæs pakkeinformationen fra serveren."
-
#~ msgid "Binary"
#~ msgstr "Binær"
diff --git a/po/de.po b/po/de.po
index 05391d23..3e598f63 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: \n"
-"POT-Creation-Date: 2006-01-26 15:51+0100\n"
+"POT-Creation-Date: 2006-02-08 21:14+0100\n"
"PO-Revision-Date: 2005-04-02 08:46+0200\n"
"Last-Translator: Frank Arnold <frank@scirocco-5v-turbo.de>\n"
"Language-Team: German GNOME Translations <gnome-de@gnome.org>\n"
@@ -19,18 +19,18 @@ msgstr ""
#: ../data/SoftwareProperties.glade.h:1
#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Internet-Aktualisierungen</b>"
+msgid "<b>Channels</b>"
+msgstr "<b>Details</b>"
#: ../data/SoftwareProperties.glade.h:2
#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Details</b>"
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet-Aktualisierungen</b>"
#: ../data/SoftwareProperties.glade.h:3
#, fuzzy
-msgid "<b>Sources</b>"
-msgstr "<b>Paketquellen</b>"
+msgid "<b>Keys</b>"
+msgstr "<b>Details</b>"
#: ../data/SoftwareProperties.glade.h:4
#, fuzzy
@@ -43,9 +43,8 @@ msgid "Authentication"
msgstr "A_uthentifizierung"
#: ../data/SoftwareProperties.glade.h:6
-#, fuzzy
-msgid "Automatically check for updates"
-msgstr "Automatische Über_prüfung auf Software-Aktualisierungen"
+msgid "D_elete downloaded software files:"
+msgstr ""
#: ../data/SoftwareProperties.glade.h:7
#, fuzzy
@@ -60,35 +59,56 @@ msgstr "Aktualisierungen werden installiert..."
#: ../data/SoftwareProperties.glade.h:9
#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Internet-Aktualisierungen</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+#, fuzzy
msgid "Restore _Defaults"
msgstr "Vorgabeschlüssel wiederherstellen"
-#: ../data/SoftwareProperties.glade.h:10
+#: ../data/SoftwareProperties.glade.h:11
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/SoftwareProperties.glade.h:11
+#: ../data/SoftwareProperties.glade.h:12
msgid "Software Preferences"
msgstr "Software-Einstellungen"
-#: ../data/SoftwareProperties.glade.h:12
-msgid ""
-"daily\n"
-"every two days\n"
-"weekly\n"
-"every two weeks\n"
-"custom"
+#: ../data/SoftwareProperties.glade.h:13
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Install new updates without confirmation"
msgstr ""
#: ../data/UpdateManager.glade.h:1
-msgid "<big><b>Install software updates</b></big>"
+msgid ""
+"<b><big>You need to manually reload the latest information about updates</"
+"big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
msgstr ""
-#: ../data/UpdateManager.glade.h:2
-msgid "<big><b>Reading package information</b></big>"
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:3
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:8
msgid ""
"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
"\n"
@@ -99,58 +119,61 @@ msgstr ""
"\n"
"Die Änderungen müssen vom zentralen Server abgerufen werden"
-#: ../data/UpdateManager.glade.h:6
-#, fuzzy
-msgid "Cancel downloading of the changelog"
-msgstr "Herunterladen des Änderungsprotokolls abbrechen"
+#: ../data/UpdateManager.glade.h:11
+msgid "Cancel _Download"
+msgstr ""
-#: ../data/UpdateManager.glade.h:7
+#: ../data/UpdateManager.glade.h:12
msgid "Changes"
msgstr "Änderungen"
-#: ../data/UpdateManager.glade.h:8
+#: ../data/UpdateManager.glade.h:13
msgid "Description"
msgstr "Beschreibung"
-#: ../data/UpdateManager.glade.h:9
-msgid ""
-"Reading information about the installed packages. Depending on the speed of "
-"your computer this may take a bit."
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:14
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:15
+#, fuzzy
+msgid "Reload the latest information about updates"
+msgstr "Aktuelle Paketinformationen vom Server beziehen."
+
+#: ../data/UpdateManager.glade.h:16
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:17
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:18
msgid "Software Updates"
msgstr "Software-Aktualisierungen"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:19
msgid ""
-"Software updates can fix possible security holes, fix possible errors, so "
-"called \"bugs\", or provide new features to you."
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "U_pgrade"
msgstr "Aktualisierung fertiggestellt"
-#: ../data/UpdateManager.glade.h:16
-msgid "_Install"
+#: ../data/UpdateManager.glade.h:21
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:22
+#, fuzzy
+msgid "_Install Updates"
msgstr "_Installieren"
# »Aktualisieren« könnte hier verwirrend sein -fa-
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:23
#, fuzzy
msgid "_Reload"
msgstr "Neu laden"
@@ -163,13 +186,15 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Breezy 6.04 \"Dapper Drake\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Breezy 5.10 \"Breezy Badger\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
#. Description
#: ../channels/Ubuntu.info.in:40
@@ -262,31 +287,41 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:237
-msgid "Choose a key-file"
-msgstr "Eine Schlüsseldatei wählen"
+#: ../SoftwareProperties/SoftwareProperties.py:102
+#, python-format
+msgid "Every %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:132
+#, python-format
+msgid "After %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:330
+msgid "Import key"
+msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:247
+#: ../SoftwareProperties/SoftwareProperties.py:340
msgid "Error importing selected file"
msgstr "Fehler beim Importieren der gewählten Datei"
-#: ../SoftwareProperties/SoftwareProperties.py:248
+#: ../SoftwareProperties/SoftwareProperties.py:341
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"Die gewählte Datei ist möglicherweise keine GPG-Schlüsseldatei oder ist "
"beschädigt."
-#: ../SoftwareProperties/SoftwareProperties.py:260
+#: ../SoftwareProperties/SoftwareProperties.py:353
msgid "Error removing the key"
msgstr "Fehler beim Entfernen des Schlüssels"
-#: ../SoftwareProperties/SoftwareProperties.py:261
+#: ../SoftwareProperties/SoftwareProperties.py:354
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"Der gewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie "
"hierfür einen Fehlerbericht."
-#: ../SoftwareProperties/SoftwareProperties.py:304
+#: ../SoftwareProperties/SoftwareProperties.py:397
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -294,38 +329,38 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:354
+#: ../SoftwareProperties/SoftwareProperties.py:447
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:463
msgid "Please insert a disc in the drive:"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:87
+#: ../DistUpgrade/DistUpgradeCache.py:92
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:88
+#: ../DistUpgrade/DistUpgradeCache.py:93
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:101
+#: ../DistUpgrade/DistUpgradeCache.py:135
msgid "Can't upgrade required meta-packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:103
+#: ../DistUpgrade/DistUpgradeCache.py:142
msgid "A essential package would have to be removed"
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:106
+#: ../DistUpgrade/DistUpgradeCache.py:145
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:107
+#: ../DistUpgrade/DistUpgradeCache.py:146
#, fuzzy
msgid ""
"A unresolvable problem occured while calculating the upgrade. Please report "
@@ -335,23 +370,23 @@ msgstr ""
"hierfür einen Fehlerbericht."
#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:129
+#: ../DistUpgrade/DistUpgradeCache.py:168
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:130
+#: ../DistUpgrade/DistUpgradeCache.py:169
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:232
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:194
+#: ../DistUpgrade/DistUpgradeCache.py:233
#, fuzzy
msgid ""
"It was impossible to install a required package. Please report this as a "
@@ -361,11 +396,11 @@ msgstr ""
"hierfür einen Fehlerbericht."
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:201
+#: ../DistUpgrade/DistUpgradeCache.py:240
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:202
+#: ../DistUpgrade/DistUpgradeCache.py:241
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
"desktop package and it was not possible to detect which version of ubuntu "
@@ -379,81 +414,81 @@ msgid "Reading cache"
msgstr ""
#. FIXME: offer to write a new self.sources.list entry
-#: ../DistUpgrade/DistUpgradeControler.py:113
+#: ../DistUpgrade/DistUpgradeControler.py:107
msgid "No valid entry found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:114
+#: ../DistUpgrade/DistUpgradeControler.py:108
msgid ""
"While scaning your repository information no valid entry for the upgrade was "
"found.\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:129
+#: ../DistUpgrade/DistUpgradeControler.py:125
msgid "Repository information invalid"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:130
+#: ../DistUpgrade/DistUpgradeControler.py:126
msgid ""
"Upgrading the repository information resulted in a invalid file. Please "
"report this as a bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:166
+#: ../DistUpgrade/DistUpgradeControler.py:171
#, fuzzy
msgid "Error during update"
msgstr "Fehler beim Entfernen des Schlüssels"
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:172
msgid ""
"A problem occured during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:186
+#: ../DistUpgrade/DistUpgradeControler.py:190
msgid "Not enough free space"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:187
+#: ../DistUpgrade/DistUpgradeControler.py:191
msgid ""
"There is not enough free space on your system to download the required "
"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
"clean'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:192
+#: ../DistUpgrade/DistUpgradeControler.py:196
#, fuzzy
msgid "Perform Upgrade?"
msgstr "Aktualisierung fertiggestellt"
#. installing the packages failed, can't be retried
-#: ../DistUpgrade/DistUpgradeControler.py:206
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:280
msgid "Error during commit"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:207
+#: ../DistUpgrade/DistUpgradeControler.py:212
msgid ""
"Some problem occured during the upgrade. Most likely packages failed to "
"install. Try 'sudo apt-get install -f' or synaptic to fix your system."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:223
+#: ../DistUpgrade/DistUpgradeControler.py:228
#, fuzzy
msgid "Error fetching the packages"
msgstr "Fehler beim Entfernen des Schlüssels"
-#: ../DistUpgrade/DistUpgradeControler.py:224
+#: ../DistUpgrade/DistUpgradeControler.py:229
msgid ""
"Some problem occured during the fetching of the packages. This is most "
"likely a network problem. Please check your network and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:273
msgid "Remove obsolete Packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:264
+#: ../DistUpgrade/DistUpgradeControler.py:281
msgid ""
"Some problem occured during the clean-up. Please see the below message for "
"more information. "
@@ -461,50 +496,54 @@ msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:279
-#: ../DistUpgrade/DistUpgradeControler.py:298
-msgid "Checking update system"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:295
+#: ../DistUpgrade/DistUpgradeControler.py:318
+#, fuzzy
+msgid "Checking package manager"
+msgstr "Ein andere Paketverwaltung läuft bereits"
-#: ../DistUpgrade/DistUpgradeControler.py:290
+#: ../DistUpgrade/DistUpgradeControler.py:310
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:324
msgid "Asking for confirmation"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:308
+#: ../DistUpgrade/DistUpgradeControler.py:328
#, fuzzy
msgid "Upgrading"
msgstr "Aktualisierung fertiggestellt"
-#: ../DistUpgrade/DistUpgradeControler.py:315
+#: ../DistUpgrade/DistUpgradeControler.py:335
msgid "Searching for obsolete software"
msgstr ""
-#. done, ask for reboot
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:340
msgid "System upgrade is complete."
msgstr ""
#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:70
+#: ../DistUpgrade/DistUpgradeViewGtk.py:76
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#: ../DistUpgrade/DistUpgradeViewGtk.py:94
+msgid "Download is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:105
#, python-format
msgid "Downloading file %li of %li with %s/s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:101
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
#, python-format
msgid "%s remaining"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:103
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
#, python-format
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
@@ -512,33 +551,32 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:126
-msgid "Installing updates ..."
-msgstr ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:131
+#, fuzzy
+msgid "Installing updates"
+msgstr "Aktualisierungen werden installiert..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:139
+#: ../DistUpgrade/DistUpgradeViewGtk.py:144
#, python-format
-msgid "Error installing '%s'"
+msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
-msgid ""
-"During the install a error occured. This is usually a bug in the packages, "
-"please report it. See the message below for more information. "
+#: ../DistUpgrade/DistUpgradeViewGtk.py:145
+msgid "The upgrade will abort. Please report the bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:224
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:225
+#: ../DistUpgrade/DistUpgradeViewGtk.py:217
msgid ""
"During the operation a fatal error occured. Please report this as a bug and "
"include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your "
"report. The upgrade will abort now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:305
+#: ../DistUpgrade/DistUpgradeViewGtk.py:293
#, python-format
msgid ""
"%s packages are going to be removed.\n"
@@ -548,37 +586,37 @@ msgid ""
"%s needs to be fetched"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:316
+#: ../DistUpgrade/DistUpgradeViewGtk.py:304
#, python-format
msgid "<b>To be removed: %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:318
+#: ../DistUpgrade/DistUpgradeViewGtk.py:306
#, python-format
msgid "To be installed: %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:308
#, python-format
msgid "To be upgraded: %s"
msgstr ""
#. print "on_window_main_delete_event()"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:351
+#: ../DistUpgrade/DistUpgradeViewGtk.py:339
msgid "Are you sure you want cancel?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:340
msgid ""
"Canceling during a upgrade can leave the system in a unstable state. It is "
"strongly adviced to continue the operation. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:67
msgid "Reboot required"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
"The upgrade is finished now. A reboot is required to now, do you want to do "
"this now?"
@@ -597,42 +635,68 @@ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:3
-msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Ubuntu wird aktualisiert</span>"
+msgid "<b><big>Start the upgrade?</big></b>"
+msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:4
+#, fuzzy
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
+"span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Ubuntu wird aktualisiert</span>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
msgid "Cleaning up"
msgstr ""
-#: ../DistUpgrade/DistUpgrade.glade.h:5
+#: ../DistUpgrade/DistUpgrade.glade.h:6
#, fuzzy
msgid "Details"
msgstr "<b>Details</b>"
-#: ../DistUpgrade/DistUpgrade.glade.h:6
-msgid "Preparing upgrade"
-msgstr ""
-
#: ../DistUpgrade/DistUpgrade.glade.h:7
-msgid "Terminal"
+msgid "Downloading and installing the upgrades"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:8
-msgid "Upgrading Ubuntu"
+msgid "Modifing the software channels"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:9
-msgid "Upgrading software channels"
+msgid "Preparing the upgrade"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Upgrading the system"
+msgid "Terminal"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
msgid "_Restart Now"
msgstr ""
+#, fuzzy
+#~ msgid "<b>Sources</b>"
+#~ msgstr "<b>Paketquellen</b>"
+
+#, fuzzy
+#~ msgid "Automatically check for updates"
+#~ msgstr "Automatische Über_prüfung auf Software-Aktualisierungen"
+
+#, fuzzy
+#~ msgid "Cancel downloading of the changelog"
+#~ msgstr "Herunterladen des Änderungsprotokolls abbrechen"
+
+#~ msgid "Choose a key-file"
+#~ msgstr "Eine Schlüsseldatei wählen"
+
#~ msgid "<b>Packages to install:</b>"
#~ msgstr "<b>Zu installierende Pakete:</b>"
@@ -829,9 +893,6 @@ msgstr ""
#~ msgid "The updates are being applied."
#~ msgstr "Die Aktualisierungen werden ausgeführt."
-#~ msgid "Another package manager is running"
-#~ msgstr "Ein andere Paketverwaltung läuft bereits"
-
#~ msgid ""
#~ "You can run only one package management application at the same time. "
#~ "Please close this other application first."
@@ -901,9 +962,6 @@ msgstr ""
#~ msgid "Ubuntu Update Manager"
#~ msgstr "Ubuntu Aktualisierungsverwaltung"
-#~ msgid "Reload the package information from the server."
-#~ msgstr "Aktuelle Paketinformationen vom Server beziehen."
-
#~ msgid "Binary"
#~ msgstr "Binär"
diff --git a/po/el.po b/po/el.po
index d3e31f95..57637ae4 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-26 15:51+0100\n"
+"POT-Creation-Date: 2006-02-08 21:14+0100\n"
"PO-Revision-Date: 2005-03-05 14:33+0200\n"
"Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
"Language-Team: Greek <team@gnome.gr>\n"
@@ -18,18 +18,18 @@ msgstr ""
#: ../data/SoftwareProperties.glade.h:1
#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Αναβαθμίσεις διαδικτύου</b>"
+msgid "<b>Channels</b>"
+msgstr "<b>Ενότητες:</b>"
#: ../data/SoftwareProperties.glade.h:2
#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Ενότητες:</b>"
+msgid "<b>Internet updates</b>"
+msgstr "<b>Αναβαθμίσεις διαδικτύου</b>"
#: ../data/SoftwareProperties.glade.h:3
#, fuzzy
-msgid "<b>Sources</b>"
-msgstr "<b>Πηγές λογισμικού</b>"
+msgid "<b>Keys</b>"
+msgstr "<b>Ενότητες:</b>"
#: ../data/SoftwareProperties.glade.h:4
msgid "Add _Cdrom"
@@ -41,7 +41,7 @@ msgid "Authentication"
msgstr "Πι_στοποίηση"
#: ../data/SoftwareProperties.glade.h:6
-msgid "Automatically check for updates"
+msgid "D_elete downloaded software files:"
msgstr ""
#: ../data/SoftwareProperties.glade.h:7
@@ -53,91 +53,114 @@ msgid "Installation Media"
msgstr ""
#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Αναβαθμίσεις διαδικτύου</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
msgid "Restore _Defaults"
msgstr ""
-#: ../data/SoftwareProperties.glade.h:10
+#: ../data/SoftwareProperties.glade.h:11
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/SoftwareProperties.glade.h:11
+#: ../data/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Software Preferences"
msgstr "<b>Πηγές λογισμικού</b>"
-#: ../data/SoftwareProperties.glade.h:12
-msgid ""
-"daily\n"
-"every two days\n"
-"weekly\n"
-"every two weeks\n"
-"custom"
+#: ../data/SoftwareProperties.glade.h:13
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Install new updates without confirmation"
msgstr ""
#: ../data/UpdateManager.glade.h:1
-msgid "<big><b>Install software updates</b></big>"
+msgid ""
+"<b><big>You need to manually reload the latest information about updates</"
+"big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
msgstr ""
-#: ../data/UpdateManager.glade.h:2
-msgid "<big><b>Reading package information</b></big>"
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:3
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:8
msgid ""
"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
"\n"
"Need to get the changes from the central server"
msgstr ""
-#: ../data/UpdateManager.glade.h:6
-msgid "Cancel downloading of the changelog"
+#: ../data/UpdateManager.glade.h:11
+msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:7
+#: ../data/UpdateManager.glade.h:12
msgid "Changes"
msgstr ""
-#: ../data/UpdateManager.glade.h:8
+#: ../data/UpdateManager.glade.h:13
msgid "Description"
msgstr ""
-#: ../data/UpdateManager.glade.h:9
-msgid ""
-"Reading information about the installed packages. Depending on the speed of "
-"your computer this may take a bit."
+#: ../data/UpdateManager.glade.h:14
+msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:10
-msgid "Release Notes"
+#: ../data/UpdateManager.glade.h:15
+msgid "Reload the latest information about updates"
msgstr ""
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:16
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:17
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:18
msgid "Software Updates"
msgstr ""
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:19
msgid ""
-"Software updates can fix possible security holes, fix possible errors, so "
-"called \"bugs\", or provide new features to you."
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:20
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:16
-msgid "_Install"
+#: ../data/UpdateManager.glade.h:21
+msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:22
+msgid "_Install Updates"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:23
msgid "_Reload"
msgstr ""
@@ -149,12 +172,12 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Breezy 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 \"Dapper Drake\""
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Breezy 5.10 \"Breezy Badger\""
+msgid "Ubuntu 5.10 \"Breezy Badger\""
msgstr ""
#. Description
@@ -243,27 +266,37 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:237
-msgid "Choose a key-file"
+#: ../SoftwareProperties/SoftwareProperties.py:102
+#, python-format
+msgid "Every %s days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:247
+#: ../SoftwareProperties/SoftwareProperties.py:132
+#, python-format
+msgid "After %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:330
+msgid "Import key"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:340
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:248
+#: ../SoftwareProperties/SoftwareProperties.py:341
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:260
+#: ../SoftwareProperties/SoftwareProperties.py:353
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:261
+#: ../SoftwareProperties/SoftwareProperties.py:354
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:304
+#: ../SoftwareProperties/SoftwareProperties.py:397
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -271,72 +304,72 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:354
+#: ../SoftwareProperties/SoftwareProperties.py:447
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:463
msgid "Please insert a disc in the drive:"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:87
+#: ../DistUpgrade/DistUpgradeCache.py:92
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:88
+#: ../DistUpgrade/DistUpgradeCache.py:93
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:101
+#: ../DistUpgrade/DistUpgradeCache.py:135
msgid "Can't upgrade required meta-packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:103
+#: ../DistUpgrade/DistUpgradeCache.py:142
msgid "A essential package would have to be removed"
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:106
+#: ../DistUpgrade/DistUpgradeCache.py:145
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:107
+#: ../DistUpgrade/DistUpgradeCache.py:146
msgid ""
"A unresolvable problem occured while calculating the upgrade. Please report "
"this as a bug. "
msgstr ""
#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:129
+#: ../DistUpgrade/DistUpgradeCache.py:168
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:130
+#: ../DistUpgrade/DistUpgradeCache.py:169
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:232
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:194
+#: ../DistUpgrade/DistUpgradeCache.py:233
msgid ""
"It was impossible to install a required package. Please report this as a "
"bug. "
msgstr ""
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:201
+#: ../DistUpgrade/DistUpgradeCache.py:240
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:202
+#: ../DistUpgrade/DistUpgradeCache.py:241
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
"desktop package and it was not possible to detect which version of ubuntu "
@@ -350,78 +383,78 @@ msgid "Reading cache"
msgstr ""
#. FIXME: offer to write a new self.sources.list entry
-#: ../DistUpgrade/DistUpgradeControler.py:113
+#: ../DistUpgrade/DistUpgradeControler.py:107
msgid "No valid entry found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:114
+#: ../DistUpgrade/DistUpgradeControler.py:108
msgid ""
"While scaning your repository information no valid entry for the upgrade was "
"found.\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:129
+#: ../DistUpgrade/DistUpgradeControler.py:125
msgid "Repository information invalid"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:130
+#: ../DistUpgrade/DistUpgradeControler.py:126
msgid ""
"Upgrading the repository information resulted in a invalid file. Please "
"report this as a bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:166
+#: ../DistUpgrade/DistUpgradeControler.py:171
msgid "Error during update"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:172
msgid ""
"A problem occured during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:186
+#: ../DistUpgrade/DistUpgradeControler.py:190
msgid "Not enough free space"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:187
+#: ../DistUpgrade/DistUpgradeControler.py:191
msgid ""
"There is not enough free space on your system to download the required "
"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
"clean'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:192
+#: ../DistUpgrade/DistUpgradeControler.py:196
msgid "Perform Upgrade?"
msgstr ""
#. installing the packages failed, can't be retried
-#: ../DistUpgrade/DistUpgradeControler.py:206
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:280
msgid "Error during commit"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:207
+#: ../DistUpgrade/DistUpgradeControler.py:212
msgid ""
"Some problem occured during the upgrade. Most likely packages failed to "
"install. Try 'sudo apt-get install -f' or synaptic to fix your system."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:223
+#: ../DistUpgrade/DistUpgradeControler.py:228
msgid "Error fetching the packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:224
+#: ../DistUpgrade/DistUpgradeControler.py:229
msgid ""
"Some problem occured during the fetching of the packages. This is most "
"likely a network problem. Please check your network and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:273
msgid "Remove obsolete Packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:264
+#: ../DistUpgrade/DistUpgradeControler.py:281
msgid ""
"Some problem occured during the clean-up. Please see the below message for "
"more information. "
@@ -429,49 +462,52 @@ msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:279
-#: ../DistUpgrade/DistUpgradeControler.py:298
-msgid "Checking update system"
+#: ../DistUpgrade/DistUpgradeControler.py:295
+#: ../DistUpgrade/DistUpgradeControler.py:318
+msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:290
+#: ../DistUpgrade/DistUpgradeControler.py:310
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:324
msgid "Asking for confirmation"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:308
+#: ../DistUpgrade/DistUpgradeControler.py:328
msgid "Upgrading"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:315
+#: ../DistUpgrade/DistUpgradeControler.py:335
msgid "Searching for obsolete software"
msgstr ""
-#. done, ask for reboot
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:340
msgid "System upgrade is complete."
msgstr ""
#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:70
+#: ../DistUpgrade/DistUpgradeViewGtk.py:76
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#: ../DistUpgrade/DistUpgradeViewGtk.py:94
+msgid "Download is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:105
#, python-format
msgid "Downloading file %li of %li with %s/s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:101
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
#, python-format
msgid "%s remaining"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:103
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
#, python-format
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
@@ -479,33 +515,31 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:126
-msgid "Installing updates ..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:131
+msgid "Installing updates"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:139
+#: ../DistUpgrade/DistUpgradeViewGtk.py:144
#, python-format
-msgid "Error installing '%s'"
+msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
-msgid ""
-"During the install a error occured. This is usually a bug in the packages, "
-"please report it. See the message below for more information. "
+#: ../DistUpgrade/DistUpgradeViewGtk.py:145
+msgid "The upgrade will abort. Please report the bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:224
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:225
+#: ../DistUpgrade/DistUpgradeViewGtk.py:217
msgid ""
"During the operation a fatal error occured. Please report this as a bug and "
"include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your "
"report. The upgrade will abort now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:305
+#: ../DistUpgrade/DistUpgradeViewGtk.py:293
#, python-format
msgid ""
"%s packages are going to be removed.\n"
@@ -515,37 +549,37 @@ msgid ""
"%s needs to be fetched"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:316
+#: ../DistUpgrade/DistUpgradeViewGtk.py:304
#, python-format
msgid "<b>To be removed: %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:318
+#: ../DistUpgrade/DistUpgradeViewGtk.py:306
#, python-format
msgid "To be installed: %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:308
#, python-format
msgid "To be upgraded: %s"
msgstr ""
#. print "on_window_main_delete_event()"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:351
+#: ../DistUpgrade/DistUpgradeViewGtk.py:339
msgid "Are you sure you want cancel?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:340
msgid ""
"Canceling during a upgrade can leave the system in a unstable state. It is "
"strongly adviced to continue the operation. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:67
msgid "Reboot required"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
"The upgrade is finished now. A reboot is required to now, do you want to do "
"this now?"
@@ -564,43 +598,57 @@ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:3
-msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgid "<b><big>Start the upgrade?</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:4
-msgid "Cleaning up"
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
+"span>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
#, fuzzy
msgid "Details"
msgstr "<b>Ενότητες:</b>"
-#: ../DistUpgrade/DistUpgrade.glade.h:6
-msgid "Preparing upgrade"
-msgstr ""
-
#: ../DistUpgrade/DistUpgrade.glade.h:7
-msgid "Terminal"
+msgid "Downloading and installing the upgrades"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:8
-msgid "Upgrading Ubuntu"
+msgid "Modifing the software channels"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:9
-msgid "Upgrading software channels"
+msgid "Preparing the upgrade"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Upgrading the system"
+msgid "Terminal"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
msgid "_Restart Now"
msgstr ""
#, fuzzy
+#~ msgid "<b>Sources</b>"
+#~ msgstr "<b>Πηγές λογισμικού</b>"
+
+#, fuzzy
#~ msgid "<b>Packages to install:</b>"
#~ msgstr "<b>Ενότητες:</b>"
diff --git a/po/en_CA.po b/po/en_CA.po
index 8c96204b..31f5f8b3 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: \n"
-"POT-Creation-Date: 2006-01-26 15:51+0100\n"
+"POT-Creation-Date: 2006-02-08 21:14+0100\n"
"PO-Revision-Date: 2005-04-03 01:26-0500\n"
"Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
"Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -18,18 +18,18 @@ msgstr ""
#: ../data/SoftwareProperties.glade.h:1
#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Internet Updates</b>"
+msgid "<b>Channels</b>"
+msgstr "<b>Details</b>"
#: ../data/SoftwareProperties.glade.h:2
#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Details</b>"
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet Updates</b>"
#: ../data/SoftwareProperties.glade.h:3
#, fuzzy
-msgid "<b>Sources</b>"
-msgstr "<b>Software Sources</b>"
+msgid "<b>Keys</b>"
+msgstr "<b>Details</b>"
#: ../data/SoftwareProperties.glade.h:4
#, fuzzy
@@ -42,9 +42,8 @@ msgid "Authentication"
msgstr "A_uthentication"
#: ../data/SoftwareProperties.glade.h:6
-#, fuzzy
-msgid "Automatically check for updates"
-msgstr "Automatically check for software _updates."
+msgid "D_elete downloaded software files:"
+msgstr ""
#: ../data/SoftwareProperties.glade.h:7
#, fuzzy
@@ -58,35 +57,56 @@ msgstr "Installing updates..."
#: ../data/SoftwareProperties.glade.h:9
#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Internet Updates</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+#, fuzzy
msgid "Restore _Defaults"
msgstr "Restore default keys"
-#: ../data/SoftwareProperties.glade.h:10
+#: ../data/SoftwareProperties.glade.h:11
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/SoftwareProperties.glade.h:11
+#: ../data/SoftwareProperties.glade.h:12
msgid "Software Preferences"
msgstr "Software Preferences"
-#: ../data/SoftwareProperties.glade.h:12
-msgid ""
-"daily\n"
-"every two days\n"
-"weekly\n"
-"every two weeks\n"
-"custom"
+#: ../data/SoftwareProperties.glade.h:13
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Install new updates without confirmation"
msgstr ""
#: ../data/UpdateManager.glade.h:1
-msgid "<big><b>Install software updates</b></big>"
+msgid ""
+"<b><big>You need to manually reload the latest information about updates</"
+"big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
msgstr ""
-#: ../data/UpdateManager.glade.h:2
-msgid "<big><b>Reading package information</b></big>"
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
-#: ../data/UpdateManager.glade.h:3
+#: ../data/UpdateManager.glade.h:8
msgid ""
"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
"\n"
@@ -96,57 +116,60 @@ msgstr ""
"\n"
"Need to get the changes from the central server"
-#: ../data/UpdateManager.glade.h:6
-#, fuzzy
-msgid "Cancel downloading of the changelog"
-msgstr "Cancel downloading the ChangeLog"
+#: ../data/UpdateManager.glade.h:11
+msgid "Cancel _Download"
+msgstr ""
-#: ../data/UpdateManager.glade.h:7
+#: ../data/UpdateManager.glade.h:12
msgid "Changes"
msgstr "Changes"
-#: ../data/UpdateManager.glade.h:8
+#: ../data/UpdateManager.glade.h:13
msgid "Description"
msgstr "Description"
-#: ../data/UpdateManager.glade.h:9
-msgid ""
-"Reading information about the installed packages. Depending on the speed of "
-"your computer this may take a bit."
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:14
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:15
+#, fuzzy
+msgid "Reload the latest information about updates"
+msgstr "Reload the package information from the server."
+
+#: ../data/UpdateManager.glade.h:16
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:17
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:18
msgid "Software Updates"
msgstr "Software Updates"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:19
msgid ""
-"Software updates can fix possible security holes, fix possible errors, so "
-"called \"bugs\", or provide new features to you."
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "U_pgrade"
msgstr "Upgrade finished"
-#: ../data/UpdateManager.glade.h:16
-msgid "_Install"
+#: ../data/UpdateManager.glade.h:21
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:22
+#, fuzzy
+msgid "_Install Updates"
msgstr "_Install"
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:23
#, fuzzy
msgid "_Reload"
msgstr "Reload"
@@ -159,13 +182,15 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Breezy 6.04 \"Dapper Drake\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgstr "Ubuntu 5.04 Security Updates"
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Breezy 5.10 \"Breezy Badger\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Ubuntu 5.04 Security Updates"
#. Description
#: ../channels/Ubuntu.info.in:40
@@ -258,28 +283,38 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:237
-msgid "Choose a key-file"
-msgstr "Choose a key-file"
+#: ../SoftwareProperties/SoftwareProperties.py:102
+#, python-format
+msgid "Every %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:132
+#, python-format
+msgid "After %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:330
+msgid "Import key"
+msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:247
+#: ../SoftwareProperties/SoftwareProperties.py:340
msgid "Error importing selected file"
msgstr "Error importing selected file"
-#: ../SoftwareProperties/SoftwareProperties.py:248
+#: ../SoftwareProperties/SoftwareProperties.py:341
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:260
+#: ../SoftwareProperties/SoftwareProperties.py:353
msgid "Error removing the key"
msgstr "Error removing the key"
-#: ../SoftwareProperties/SoftwareProperties.py:261
+#: ../SoftwareProperties/SoftwareProperties.py:354
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:304
+#: ../SoftwareProperties/SoftwareProperties.py:397
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -287,38 +322,38 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:354
+#: ../SoftwareProperties/SoftwareProperties.py:447
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:463
msgid "Please insert a disc in the drive:"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:87
+#: ../DistUpgrade/DistUpgradeCache.py:92
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:88
+#: ../DistUpgrade/DistUpgradeCache.py:93
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:101
+#: ../DistUpgrade/DistUpgradeCache.py:135
msgid "Can't upgrade required meta-packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:103
+#: ../DistUpgrade/DistUpgradeCache.py:142
msgid "A essential package would have to be removed"
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:106
+#: ../DistUpgrade/DistUpgradeCache.py:145
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:107
+#: ../DistUpgrade/DistUpgradeCache.py:146
#, fuzzy
msgid ""
"A unresolvable problem occured while calculating the upgrade. Please report "
@@ -327,23 +362,23 @@ msgstr ""
"The key you selected could not be removed. Please report this as a bug."
#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:129
+#: ../DistUpgrade/DistUpgradeCache.py:168
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:130
+#: ../DistUpgrade/DistUpgradeCache.py:169
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:232
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:194
+#: ../DistUpgrade/DistUpgradeCache.py:233
#, fuzzy
msgid ""
"It was impossible to install a required package. Please report this as a "
@@ -352,11 +387,11 @@ msgstr ""
"The key you selected could not be removed. Please report this as a bug."
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:201
+#: ../DistUpgrade/DistUpgradeCache.py:240
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:202
+#: ../DistUpgrade/DistUpgradeCache.py:241
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
"desktop package and it was not possible to detect which version of ubuntu "
@@ -370,81 +405,81 @@ msgid "Reading cache"
msgstr ""
#. FIXME: offer to write a new self.sources.list entry
-#: ../DistUpgrade/DistUpgradeControler.py:113
+#: ../DistUpgrade/DistUpgradeControler.py:107
msgid "No valid entry found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:114
+#: ../DistUpgrade/DistUpgradeControler.py:108
msgid ""
"While scaning your repository information no valid entry for the upgrade was "
"found.\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:129
+#: ../DistUpgrade/DistUpgradeControler.py:125
msgid "Repository information invalid"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:130
+#: ../DistUpgrade/DistUpgradeControler.py:126
msgid ""
"Upgrading the repository information resulted in a invalid file. Please "
"report this as a bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:166
+#: ../DistUpgrade/DistUpgradeControler.py:171
#, fuzzy
msgid "Error during update"
msgstr "Error removing the key"
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:172
msgid ""
"A problem occured during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:186
+#: ../DistUpgrade/DistUpgradeControler.py:190
msgid "Not enough free space"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:187
+#: ../DistUpgrade/DistUpgradeControler.py:191
msgid ""
"There is not enough free space on your system to download the required "
"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
"clean'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:192
+#: ../DistUpgrade/DistUpgradeControler.py:196
#, fuzzy
msgid "Perform Upgrade?"
msgstr "Upgrade finished"
#. installing the packages failed, can't be retried
-#: ../DistUpgrade/DistUpgradeControler.py:206
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:280
msgid "Error during commit"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:207
+#: ../DistUpgrade/DistUpgradeControler.py:212
msgid ""
"Some problem occured during the upgrade. Most likely packages failed to "
"install. Try 'sudo apt-get install -f' or synaptic to fix your system."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:223
+#: ../DistUpgrade/DistUpgradeControler.py:228
#, fuzzy
msgid "Error fetching the packages"
msgstr "Error removing the key"
-#: ../DistUpgrade/DistUpgradeControler.py:224
+#: ../DistUpgrade/DistUpgradeControler.py:229
msgid ""
"Some problem occured during the fetching of the packages. This is most "
"likely a network problem. Please check your network and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:273
msgid "Remove obsolete Packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:264
+#: ../DistUpgrade/DistUpgradeControler.py:281
msgid ""
"Some problem occured during the clean-up. Please see the below message for "
"more information. "
@@ -452,50 +487,54 @@ msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:279
-#: ../DistUpgrade/DistUpgradeControler.py:298
-msgid "Checking update system"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:295
+#: ../DistUpgrade/DistUpgradeControler.py:318
+#, fuzzy
+msgid "Checking package manager"
+msgstr "Another package manager is running"
-#: ../DistUpgrade/DistUpgradeControler.py:290
+#: ../DistUpgrade/DistUpgradeControler.py:310
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:324
msgid "Asking for confirmation"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:308
+#: ../DistUpgrade/DistUpgradeControler.py:328
#, fuzzy
msgid "Upgrading"
msgstr "Upgrade finished"
-#: ../DistUpgrade/DistUpgradeControler.py:315
+#: ../DistUpgrade/DistUpgradeControler.py:335
msgid "Searching for obsolete software"
msgstr ""
-#. done, ask for reboot
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:340
msgid "System upgrade is complete."
msgstr ""
#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:70
+#: ../DistUpgrade/DistUpgradeViewGtk.py:76
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#: ../DistUpgrade/DistUpgradeViewGtk.py:94
+msgid "Download is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:105
#, python-format
msgid "Downloading file %li of %li with %s/s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:101
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
#, python-format
msgid "%s remaining"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:103
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
#, python-format
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
@@ -503,33 +542,32 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:126
-msgid "Installing updates ..."
-msgstr ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:131
+#, fuzzy
+msgid "Installing updates"
+msgstr "Installing updates..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:139
+#: ../DistUpgrade/DistUpgradeViewGtk.py:144
#, python-format
-msgid "Error installing '%s'"
+msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
-msgid ""
-"During the install a error occured. This is usually a bug in the packages, "
-"please report it. See the message below for more information. "
+#: ../DistUpgrade/DistUpgradeViewGtk.py:145
+msgid "The upgrade will abort. Please report the bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:224
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:225
+#: ../DistUpgrade/DistUpgradeViewGtk.py:217
msgid ""
"During the operation a fatal error occured. Please report this as a bug and "
"include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your "
"report. The upgrade will abort now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:305
+#: ../DistUpgrade/DistUpgradeViewGtk.py:293
#, python-format
msgid ""
"%s packages are going to be removed.\n"
@@ -539,37 +577,37 @@ msgid ""
"%s needs to be fetched"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:316
+#: ../DistUpgrade/DistUpgradeViewGtk.py:304
#, python-format
msgid "<b>To be removed: %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:318
+#: ../DistUpgrade/DistUpgradeViewGtk.py:306
#, python-format
msgid "To be installed: %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:308
#, python-format
msgid "To be upgraded: %s"
msgstr ""
#. print "on_window_main_delete_event()"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:351
+#: ../DistUpgrade/DistUpgradeViewGtk.py:339
msgid "Are you sure you want cancel?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:340
msgid ""
"Canceling during a upgrade can leave the system in a unstable state. It is "
"strongly adviced to continue the operation. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:67
msgid "Reboot required"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
"The upgrade is finished now. A reboot is required to now, do you want to do "
"this now?"
@@ -588,42 +626,67 @@ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:3
-msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgid "<b><big>Start the upgrade?</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:4
-msgid "Cleaning up"
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
+"span>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
#, fuzzy
msgid "Details"
msgstr "<b>Details</b>"
-#: ../DistUpgrade/DistUpgrade.glade.h:6
-msgid "Preparing upgrade"
-msgstr ""
-
#: ../DistUpgrade/DistUpgrade.glade.h:7
-msgid "Terminal"
+msgid "Downloading and installing the upgrades"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:8
-msgid "Upgrading Ubuntu"
+msgid "Modifing the software channels"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:9
-msgid "Upgrading software channels"
+msgid "Preparing the upgrade"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Upgrading the system"
+msgid "Terminal"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
msgid "_Restart Now"
msgstr ""
+#, fuzzy
+#~ msgid "<b>Sources</b>"
+#~ msgstr "<b>Software Sources</b>"
+
+#, fuzzy
+#~ msgid "Automatically check for updates"
+#~ msgstr "Automatically check for software _updates."
+
+#, fuzzy
+#~ msgid "Cancel downloading of the changelog"
+#~ msgstr "Cancel downloading the ChangeLog"
+
+#~ msgid "Choose a key-file"
+#~ msgstr "Choose a key-file"
+
#~ msgid "<b>Packages to install:</b>"
#~ msgstr "<b>Packages to install:</b>"
@@ -812,9 +875,6 @@ msgstr ""
#~ msgid "The updates are being applied."
#~ msgstr "The updates are being applied."
-#~ msgid "Another package manager is running"
-#~ msgstr "Another package manager is running"
-
#~ msgid ""
#~ "You can run only one package management application at the same time. "
#~ "Please close this other application first."
@@ -882,9 +942,6 @@ msgstr ""
#~ msgid "Ubuntu Update Manager"
#~ msgstr "Ubuntu Update Manager"
-#~ msgid "Reload the package information from the server."
-#~ msgstr "Reload the package information from the server."
-
#~ msgid "Binary"
#~ msgstr "Binary"
diff --git a/po/es.po b/po/es.po
index 308448fd..cfa4ec33 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-26 15:51+0100\n"
+"POT-Creation-Date: 2006-02-08 21:14+0100\n"
"PO-Revision-Date: 2005-04-04 15:00+0200\n"
"Last-Translator: Jorge Bernal <koke@amedias.org>\n"
"Language-Team: Spanish <traductores@gnome.org>\n"
@@ -21,18 +21,18 @@ msgstr ""
#: ../data/SoftwareProperties.glade.h:1
#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Actualizaciones por Internet</b>"
+msgid "<b>Channels</b>"
+msgstr "<b>Detalles:</b>"
#: ../data/SoftwareProperties.glade.h:2
#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Detalles:</b>"
+msgid "<b>Internet updates</b>"
+msgstr "<b>Actualizaciones por Internet</b>"
#: ../data/SoftwareProperties.glade.h:3
#, fuzzy
-msgid "<b>Sources</b>"
-msgstr "<b>Orígenes de software</b>"
+msgid "<b>Keys</b>"
+msgstr "<b>Detalles:</b>"
#: ../data/SoftwareProperties.glade.h:4
#, fuzzy
@@ -45,9 +45,8 @@ msgid "Authentication"
msgstr "A_utenticación"
#: ../data/SoftwareProperties.glade.h:6
-#, fuzzy
-msgid "Automatically check for updates"
-msgstr "_Comprobar automáticamente las actualizaciones de software."
+msgid "D_elete downloaded software files:"
+msgstr ""
#: ../data/SoftwareProperties.glade.h:7
#, fuzzy
@@ -61,35 +60,56 @@ msgstr "Instalando actualizaciones..."
#: ../data/SoftwareProperties.glade.h:9
#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Actualizaciones por Internet</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+#, fuzzy
msgid "Restore _Defaults"
msgstr "Recuperar claves predeterminadas"
-#: ../data/SoftwareProperties.glade.h:10
+#: ../data/SoftwareProperties.glade.h:11
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/SoftwareProperties.glade.h:11
+#: ../data/SoftwareProperties.glade.h:12
msgid "Software Preferences"
msgstr "Preferencias de software"
-#: ../data/SoftwareProperties.glade.h:12
-msgid ""
-"daily\n"
-"every two days\n"
-"weekly\n"
-"every two weeks\n"
-"custom"
+#: ../data/SoftwareProperties.glade.h:13
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Install new updates without confirmation"
msgstr ""
#: ../data/UpdateManager.glade.h:1
-msgid "<big><b>Install software updates</b></big>"
+msgid ""
+"<b><big>You need to manually reload the latest information about updates</"
+"big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
msgstr ""
-#: ../data/UpdateManager.glade.h:2
-msgid "<big><b>Reading package information</b></big>"
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
-#: ../data/UpdateManager.glade.h:3
+#: ../data/UpdateManager.glade.h:8
msgid ""
"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
"\n"
@@ -99,57 +119,60 @@ msgstr ""
"\n"
"Se necesita descargar los cambios del servidor central"
-#: ../data/UpdateManager.glade.h:6
-#, fuzzy
-msgid "Cancel downloading of the changelog"
-msgstr "Cancelar la descarga del informe de cambios"
+#: ../data/UpdateManager.glade.h:11
+msgid "Cancel _Download"
+msgstr ""
-#: ../data/UpdateManager.glade.h:7
+#: ../data/UpdateManager.glade.h:12
msgid "Changes"
msgstr "Cambios"
-#: ../data/UpdateManager.glade.h:8
+#: ../data/UpdateManager.glade.h:13
msgid "Description"
msgstr "Descripción"
-#: ../data/UpdateManager.glade.h:9
-msgid ""
-"Reading information about the installed packages. Depending on the speed of "
-"your computer this may take a bit."
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:14
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:15
+#, fuzzy
+msgid "Reload the latest information about updates"
+msgstr "Recargar la información del paquete desde el servidor."
+
+#: ../data/UpdateManager.glade.h:16
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:17
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:18
msgid "Software Updates"
msgstr "Actualizaciones de software"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:19
msgid ""
-"Software updates can fix possible security holes, fix possible errors, so "
-"called \"bugs\", or provide new features to you."
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "U_pgrade"
msgstr "Actualización finalizada"
-#: ../data/UpdateManager.glade.h:16
-msgid "_Install"
+#: ../data/UpdateManager.glade.h:21
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:22
+#, fuzzy
+msgid "_Install Updates"
msgstr "_Instalar"
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:23
#, fuzzy
msgid "_Reload"
msgstr "Recargar"
@@ -162,13 +185,15 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Breezy 6.04 \"Dapper Drake\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Breezy 5.10 \"Breezy Badger\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:40
@@ -261,31 +286,41 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:237
-msgid "Choose a key-file"
-msgstr "Elija un fichero de clave"
+#: ../SoftwareProperties/SoftwareProperties.py:102
+#, python-format
+msgid "Every %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:132
+#, python-format
+msgid "After %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:330
+msgid "Import key"
+msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:247
+#: ../SoftwareProperties/SoftwareProperties.py:340
msgid "Error importing selected file"
msgstr "Hubo un error al importar el fichero seleccionado"
-#: ../SoftwareProperties/SoftwareProperties.py:248
+#: ../SoftwareProperties/SoftwareProperties.py:341
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"Puede que el fichero seleccionado no sea un fichero de clave GPG o que esté "
"corrupto."
-#: ../SoftwareProperties/SoftwareProperties.py:260
+#: ../SoftwareProperties/SoftwareProperties.py:353
msgid "Error removing the key"
msgstr "Hubo un error al quitar la clave"
-#: ../SoftwareProperties/SoftwareProperties.py:261
+#: ../SoftwareProperties/SoftwareProperties.py:354
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:304
+#: ../SoftwareProperties/SoftwareProperties.py:397
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -293,38 +328,38 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:354
+#: ../SoftwareProperties/SoftwareProperties.py:447
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:463
msgid "Please insert a disc in the drive:"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:87
+#: ../DistUpgrade/DistUpgradeCache.py:92
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:88
+#: ../DistUpgrade/DistUpgradeCache.py:93
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:101
+#: ../DistUpgrade/DistUpgradeCache.py:135
msgid "Can't upgrade required meta-packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:103
+#: ../DistUpgrade/DistUpgradeCache.py:142
msgid "A essential package would have to be removed"
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:106
+#: ../DistUpgrade/DistUpgradeCache.py:145
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:107
+#: ../DistUpgrade/DistUpgradeCache.py:146
#, fuzzy
msgid ""
"A unresolvable problem occured while calculating the upgrade. Please report "
@@ -334,23 +369,23 @@ msgstr ""
"como un fallo."
#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:129
+#: ../DistUpgrade/DistUpgradeCache.py:168
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:130
+#: ../DistUpgrade/DistUpgradeCache.py:169
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:232
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:194
+#: ../DistUpgrade/DistUpgradeCache.py:233
#, fuzzy
msgid ""
"It was impossible to install a required package. Please report this as a "
@@ -360,11 +395,11 @@ msgstr ""
"como un fallo."
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:201
+#: ../DistUpgrade/DistUpgradeCache.py:240
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:202
+#: ../DistUpgrade/DistUpgradeCache.py:241
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
"desktop package and it was not possible to detect which version of ubuntu "
@@ -378,81 +413,81 @@ msgid "Reading cache"
msgstr ""
#. FIXME: offer to write a new self.sources.list entry
-#: ../DistUpgrade/DistUpgradeControler.py:113
+#: ../DistUpgrade/DistUpgradeControler.py:107
msgid "No valid entry found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:114
+#: ../DistUpgrade/DistUpgradeControler.py:108
msgid ""
"While scaning your repository information no valid entry for the upgrade was "
"found.\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:129
+#: ../DistUpgrade/DistUpgradeControler.py:125
msgid "Repository information invalid"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:130
+#: ../DistUpgrade/DistUpgradeControler.py:126
msgid ""
"Upgrading the repository information resulted in a invalid file. Please "
"report this as a bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:166
+#: ../DistUpgrade/DistUpgradeControler.py:171
#, fuzzy
msgid "Error during update"
msgstr "Hubo un error al quitar la clave"
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:172
msgid ""
"A problem occured during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:186
+#: ../DistUpgrade/DistUpgradeControler.py:190
msgid "Not enough free space"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:187
+#: ../DistUpgrade/DistUpgradeControler.py:191
msgid ""
"There is not enough free space on your system to download the required "
"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
"clean'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:192
+#: ../DistUpgrade/DistUpgradeControler.py:196
#, fuzzy
msgid "Perform Upgrade?"
msgstr "Actualización finalizada"
#. installing the packages failed, can't be retried
-#: ../DistUpgrade/DistUpgradeControler.py:206
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:280
msgid "Error during commit"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:207
+#: ../DistUpgrade/DistUpgradeControler.py:212
msgid ""
"Some problem occured during the upgrade. Most likely packages failed to "
"install. Try 'sudo apt-get install -f' or synaptic to fix your system."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:223
+#: ../DistUpgrade/DistUpgradeControler.py:228
#, fuzzy
msgid "Error fetching the packages"
msgstr "Hubo un error al quitar la clave"
-#: ../DistUpgrade/DistUpgradeControler.py:224
+#: ../DistUpgrade/DistUpgradeControler.py:229
msgid ""
"Some problem occured during the fetching of the packages. This is most "
"likely a network problem. Please check your network and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:273
msgid "Remove obsolete Packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:264
+#: ../DistUpgrade/DistUpgradeControler.py:281
msgid ""
"Some problem occured during the clean-up. Please see the below message for "
"more information. "
@@ -460,50 +495,54 @@ msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:279
-#: ../DistUpgrade/DistUpgradeControler.py:298
-msgid "Checking update system"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:295
+#: ../DistUpgrade/DistUpgradeControler.py:318
+#, fuzzy
+msgid "Checking package manager"
+msgstr "Ya hay otro gestor de paquetes en ejecución"
-#: ../DistUpgrade/DistUpgradeControler.py:290
+#: ../DistUpgrade/DistUpgradeControler.py:310
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:324
msgid "Asking for confirmation"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:308
+#: ../DistUpgrade/DistUpgradeControler.py:328
#, fuzzy
msgid "Upgrading"
msgstr "Actualización finalizada"
-#: ../DistUpgrade/DistUpgradeControler.py:315
+#: ../DistUpgrade/DistUpgradeControler.py:335
msgid "Searching for obsolete software"
msgstr ""
-#. done, ask for reboot
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:340
msgid "System upgrade is complete."
msgstr ""
#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:70
+#: ../DistUpgrade/DistUpgradeViewGtk.py:76
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#: ../DistUpgrade/DistUpgradeViewGtk.py:94
+msgid "Download is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:105
#, python-format
msgid "Downloading file %li of %li with %s/s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:101
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
#, python-format
msgid "%s remaining"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:103
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
#, python-format
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
@@ -511,33 +550,32 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:126
-msgid "Installing updates ..."
-msgstr ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:131
+#, fuzzy
+msgid "Installing updates"
+msgstr "Instalando actualizaciones..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:139
+#: ../DistUpgrade/DistUpgradeViewGtk.py:144
#, python-format
-msgid "Error installing '%s'"
+msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
-msgid ""
-"During the install a error occured. This is usually a bug in the packages, "
-"please report it. See the message below for more information. "
+#: ../DistUpgrade/DistUpgradeViewGtk.py:145
+msgid "The upgrade will abort. Please report the bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:224
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:225
+#: ../DistUpgrade/DistUpgradeViewGtk.py:217
msgid ""
"During the operation a fatal error occured. Please report this as a bug and "
"include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your "
"report. The upgrade will abort now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:305
+#: ../DistUpgrade/DistUpgradeViewGtk.py:293
#, python-format
msgid ""
"%s packages are going to be removed.\n"
@@ -547,37 +585,37 @@ msgid ""
"%s needs to be fetched"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:316
+#: ../DistUpgrade/DistUpgradeViewGtk.py:304
#, python-format
msgid "<b>To be removed: %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:318
+#: ../DistUpgrade/DistUpgradeViewGtk.py:306
#, python-format
msgid "To be installed: %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:308
#, python-format
msgid "To be upgraded: %s"
msgstr ""
#. print "on_window_main_delete_event()"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:351
+#: ../DistUpgrade/DistUpgradeViewGtk.py:339
msgid "Are you sure you want cancel?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:340
msgid ""
"Canceling during a upgrade can leave the system in a unstable state. It is "
"strongly adviced to continue the operation. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:67
msgid "Reboot required"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
"The upgrade is finished now. A reboot is required to now, do you want to do "
"this now?"
@@ -596,42 +634,67 @@ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:3
-msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgid "<b><big>Start the upgrade?</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:4
-msgid "Cleaning up"
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
+"span>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
#, fuzzy
msgid "Details"
msgstr "<b>Detalles:</b>"
-#: ../DistUpgrade/DistUpgrade.glade.h:6
-msgid "Preparing upgrade"
-msgstr ""
-
#: ../DistUpgrade/DistUpgrade.glade.h:7
-msgid "Terminal"
+msgid "Downloading and installing the upgrades"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:8
-msgid "Upgrading Ubuntu"
+msgid "Modifing the software channels"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:9
-msgid "Upgrading software channels"
+msgid "Preparing the upgrade"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Upgrading the system"
+msgid "Terminal"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
msgid "_Restart Now"
msgstr ""
+#, fuzzy
+#~ msgid "<b>Sources</b>"
+#~ msgstr "<b>Orígenes de software</b>"
+
+#, fuzzy
+#~ msgid "Automatically check for updates"
+#~ msgstr "_Comprobar automáticamente las actualizaciones de software."
+
+#, fuzzy
+#~ msgid "Cancel downloading of the changelog"
+#~ msgstr "Cancelar la descarga del informe de cambios"
+
+#~ msgid "Choose a key-file"
+#~ msgstr "Elija un fichero de clave"
+
#~ msgid "<b>Packages to install:</b>"
#~ msgstr "<b>Paquetes a instalar:</b>"
@@ -825,9 +888,6 @@ msgstr ""
#~ msgid "The updates are being applied."
#~ msgstr "Se están aplicando las actualizaciones."
-#~ msgid "Another package manager is running"
-#~ msgstr "Ya hay otro gestor de paquetes en ejecución"
-
#~ msgid ""
#~ "You can run only one package management application at the same time. "
#~ "Please close this other application first."
@@ -896,9 +956,6 @@ msgstr ""
#~ msgid "Ubuntu Update Manager"
#~ msgstr "Gestor de actualizaciones de Ubuntu"
-#~ msgid "Reload the package information from the server."
-#~ msgstr "Recargar la información del paquete desde el servidor."
-
#~ msgid "Binary"
#~ msgstr "Binario"
diff --git a/po/fi.po b/po/fi.po
index 84d9a051..1287d246 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: \n"
-"POT-Creation-Date: 2006-01-26 15:51+0100\n"
+"POT-Creation-Date: 2006-02-08 21:14+0100\n"
"PO-Revision-Date: 2005-03-30 08:30+0200\n"
"Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
"Language-Team: Finnish <LL@li.org>\n"
@@ -18,18 +18,18 @@ msgstr ""
#: ../data/SoftwareProperties.glade.h:1
#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Internet-päivitykset</b>"
+msgid "<b>Channels</b>"
+msgstr "<b>Yksityiskohdat</b>"
#: ../data/SoftwareProperties.glade.h:2
#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Yksityiskohdat</b>"
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet-päivitykset</b>"
#: ../data/SoftwareProperties.glade.h:3
#, fuzzy
-msgid "<b>Sources</b>"
-msgstr "<b>Ohjelmalähteet</b>"
+msgid "<b>Keys</b>"
+msgstr "<b>Yksityiskohdat</b>"
#: ../data/SoftwareProperties.glade.h:4
#, fuzzy
@@ -42,9 +42,8 @@ msgid "Authentication"
msgstr "Varmenn_us"
#: ../data/SoftwareProperties.glade.h:6
-#, fuzzy
-msgid "Automatically check for updates"
-msgstr "Tarkista ohjelma_päivitykset automaattisesti."
+msgid "D_elete downloaded software files:"
+msgstr ""
#: ../data/SoftwareProperties.glade.h:7
#, fuzzy
@@ -57,35 +56,56 @@ msgstr ""
#: ../data/SoftwareProperties.glade.h:9
#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Internet-päivitykset</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+#, fuzzy
msgid "Restore _Defaults"
msgstr "Palauta oletusavaimet"
-#: ../data/SoftwareProperties.glade.h:10
+#: ../data/SoftwareProperties.glade.h:11
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/SoftwareProperties.glade.h:11
+#: ../data/SoftwareProperties.glade.h:12
msgid "Software Preferences"
msgstr "Asetukset"
-#: ../data/SoftwareProperties.glade.h:12
-msgid ""
-"daily\n"
-"every two days\n"
-"weekly\n"
-"every two weeks\n"
-"custom"
+#: ../data/SoftwareProperties.glade.h:13
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Install new updates without confirmation"
msgstr ""
#: ../data/UpdateManager.glade.h:1
-msgid "<big><b>Install software updates</b></big>"
+msgid ""
+"<b><big>You need to manually reload the latest information about updates</"
+"big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
msgstr ""
-#: ../data/UpdateManager.glade.h:2
-msgid "<big><b>Reading package information</b></big>"
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:3
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:8
msgid ""
"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
"\n"
@@ -95,57 +115,60 @@ msgstr ""
"\n"
"Muutokset täytyy ladata keskuspalvelimelta"
-#: ../data/UpdateManager.glade.h:6
-#, fuzzy
-msgid "Cancel downloading of the changelog"
-msgstr "Keskeytä muutosluettelon lataus"
+#: ../data/UpdateManager.glade.h:11
+msgid "Cancel _Download"
+msgstr ""
-#: ../data/UpdateManager.glade.h:7
+#: ../data/UpdateManager.glade.h:12
msgid "Changes"
msgstr "Muutokset"
-#: ../data/UpdateManager.glade.h:8
+#: ../data/UpdateManager.glade.h:13
msgid "Description"
msgstr "Kuvaus"
-#: ../data/UpdateManager.glade.h:9
-msgid ""
-"Reading information about the installed packages. Depending on the speed of "
-"your computer this may take a bit."
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:14
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:15
+#, fuzzy
+msgid "Reload the latest information about updates"
+msgstr "Lataa pakettitiedot uudelleen palvelimelta."
+
+#: ../data/UpdateManager.glade.h:16
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:17
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:18
msgid "Software Updates"
msgstr "Ohjelmapäivitykset"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:19
msgid ""
-"Software updates can fix possible security holes, fix possible errors, so "
-"called \"bugs\", or provide new features to you."
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "U_pgrade"
msgstr "Päivitykset suoritettu"
-#: ../data/UpdateManager.glade.h:16
-msgid "_Install"
+#: ../data/UpdateManager.glade.h:21
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:22
+#, fuzzy
+msgid "_Install Updates"
msgstr "_Asenna"
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:23
#, fuzzy
msgid "_Reload"
msgstr "Päivitä"
@@ -158,13 +181,15 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Breezy 6.04 \"Dapper Drake\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Breezy 5.10 \"Breezy Badger\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
#. Description
#: ../channels/Ubuntu.info.in:40
@@ -257,28 +282,38 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:237
-msgid "Choose a key-file"
-msgstr "Valitse avaintiedosto"
+#: ../SoftwareProperties/SoftwareProperties.py:102
+#, python-format
+msgid "Every %s days"
+msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:247
+#: ../SoftwareProperties/SoftwareProperties.py:132
+#, python-format
+msgid "After %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:330
+msgid "Import key"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:340
msgid "Error importing selected file"
msgstr "Virhe tuotaessa valittua avainta"
-#: ../SoftwareProperties/SoftwareProperties.py:248
+#: ../SoftwareProperties/SoftwareProperties.py:341
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr "Valittua tedosto ei ole kelvollinen GPG:n avaintiedosto"
-#: ../SoftwareProperties/SoftwareProperties.py:260
+#: ../SoftwareProperties/SoftwareProperties.py:353
msgid "Error removing the key"
msgstr "Virhe poistettaessa avainta"
-#: ../SoftwareProperties/SoftwareProperties.py:261
+#: ../SoftwareProperties/SoftwareProperties.py:354
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:304
+#: ../SoftwareProperties/SoftwareProperties.py:397
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -286,38 +321,38 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:354
+#: ../SoftwareProperties/SoftwareProperties.py:447
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:463
msgid "Please insert a disc in the drive:"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:87
+#: ../DistUpgrade/DistUpgradeCache.py:92
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:88
+#: ../DistUpgrade/DistUpgradeCache.py:93
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:101
+#: ../DistUpgrade/DistUpgradeCache.py:135
msgid "Can't upgrade required meta-packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:103
+#: ../DistUpgrade/DistUpgradeCache.py:142
msgid "A essential package would have to be removed"
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:106
+#: ../DistUpgrade/DistUpgradeCache.py:145
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:107
+#: ../DistUpgrade/DistUpgradeCache.py:146
#, fuzzy
msgid ""
"A unresolvable problem occured while calculating the upgrade. Please report "
@@ -326,23 +361,23 @@ msgstr ""
"Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus."
#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:129
+#: ../DistUpgrade/DistUpgradeCache.py:168
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:130
+#: ../DistUpgrade/DistUpgradeCache.py:169
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:232
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:194
+#: ../DistUpgrade/DistUpgradeCache.py:233
#, fuzzy
msgid ""
"It was impossible to install a required package. Please report this as a "
@@ -351,11 +386,11 @@ msgstr ""
"Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus."
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:201
+#: ../DistUpgrade/DistUpgradeCache.py:240
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:202
+#: ../DistUpgrade/DistUpgradeCache.py:241
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
"desktop package and it was not possible to detect which version of ubuntu "
@@ -369,81 +404,81 @@ msgid "Reading cache"
msgstr ""
#. FIXME: offer to write a new self.sources.list entry
-#: ../DistUpgrade/DistUpgradeControler.py:113
+#: ../DistUpgrade/DistUpgradeControler.py:107
msgid "No valid entry found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:114
+#: ../DistUpgrade/DistUpgradeControler.py:108
msgid ""
"While scaning your repository information no valid entry for the upgrade was "
"found.\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:129
+#: ../DistUpgrade/DistUpgradeControler.py:125
msgid "Repository information invalid"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:130
+#: ../DistUpgrade/DistUpgradeControler.py:126
msgid ""
"Upgrading the repository information resulted in a invalid file. Please "
"report this as a bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:166
+#: ../DistUpgrade/DistUpgradeControler.py:171
#, fuzzy
msgid "Error during update"
msgstr "Virhe poistettaessa avainta"
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:172
msgid ""
"A problem occured during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:186
+#: ../DistUpgrade/DistUpgradeControler.py:190
msgid "Not enough free space"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:187
+#: ../DistUpgrade/DistUpgradeControler.py:191
msgid ""
"There is not enough free space on your system to download the required "
"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
"clean'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:192
+#: ../DistUpgrade/DistUpgradeControler.py:196
#, fuzzy
msgid "Perform Upgrade?"
msgstr "Päivitykset suoritettu"
#. installing the packages failed, can't be retried
-#: ../DistUpgrade/DistUpgradeControler.py:206
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:280
msgid "Error during commit"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:207
+#: ../DistUpgrade/DistUpgradeControler.py:212
msgid ""
"Some problem occured during the upgrade. Most likely packages failed to "
"install. Try 'sudo apt-get install -f' or synaptic to fix your system."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:223
+#: ../DistUpgrade/DistUpgradeControler.py:228
#, fuzzy
msgid "Error fetching the packages"
msgstr "Virhe poistettaessa avainta"
-#: ../DistUpgrade/DistUpgradeControler.py:224
+#: ../DistUpgrade/DistUpgradeControler.py:229
msgid ""
"Some problem occured during the fetching of the packages. This is most "
"likely a network problem. Please check your network and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:273
msgid "Remove obsolete Packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:264
+#: ../DistUpgrade/DistUpgradeControler.py:281
msgid ""
"Some problem occured during the clean-up. Please see the below message for "
"more information. "
@@ -451,50 +486,54 @@ msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:279
-#: ../DistUpgrade/DistUpgradeControler.py:298
-msgid "Checking update system"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:295
+#: ../DistUpgrade/DistUpgradeControler.py:318
+#, fuzzy
+msgid "Checking package manager"
+msgstr "Toinen pakettienhallinta on käynnissä"
-#: ../DistUpgrade/DistUpgradeControler.py:290
+#: ../DistUpgrade/DistUpgradeControler.py:310
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:324
msgid "Asking for confirmation"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:308
+#: ../DistUpgrade/DistUpgradeControler.py:328
#, fuzzy
msgid "Upgrading"
msgstr "Päivitykset suoritettu"
-#: ../DistUpgrade/DistUpgradeControler.py:315
+#: ../DistUpgrade/DistUpgradeControler.py:335
msgid "Searching for obsolete software"
msgstr ""
-#. done, ask for reboot
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:340
msgid "System upgrade is complete."
msgstr ""
#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:70
+#: ../DistUpgrade/DistUpgradeViewGtk.py:76
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#: ../DistUpgrade/DistUpgradeViewGtk.py:94
+msgid "Download is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:105
#, python-format
msgid "Downloading file %li of %li with %s/s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:101
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
#, python-format
msgid "%s remaining"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:103
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
#, python-format
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
@@ -502,33 +541,31 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:126
-msgid "Installing updates ..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:131
+msgid "Installing updates"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:139
+#: ../DistUpgrade/DistUpgradeViewGtk.py:144
#, python-format
-msgid "Error installing '%s'"
+msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
-msgid ""
-"During the install a error occured. This is usually a bug in the packages, "
-"please report it. See the message below for more information. "
+#: ../DistUpgrade/DistUpgradeViewGtk.py:145
+msgid "The upgrade will abort. Please report the bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:224
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:225
+#: ../DistUpgrade/DistUpgradeViewGtk.py:217
msgid ""
"During the operation a fatal error occured. Please report this as a bug and "
"include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your "
"report. The upgrade will abort now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:305
+#: ../DistUpgrade/DistUpgradeViewGtk.py:293
#, python-format
msgid ""
"%s packages are going to be removed.\n"
@@ -538,37 +575,37 @@ msgid ""
"%s needs to be fetched"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:316
+#: ../DistUpgrade/DistUpgradeViewGtk.py:304
#, python-format
msgid "<b>To be removed: %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:318
+#: ../DistUpgrade/DistUpgradeViewGtk.py:306
#, python-format
msgid "To be installed: %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:308
#, python-format
msgid "To be upgraded: %s"
msgstr ""
#. print "on_window_main_delete_event()"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:351
+#: ../DistUpgrade/DistUpgradeViewGtk.py:339
msgid "Are you sure you want cancel?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:340
msgid ""
"Canceling during a upgrade can leave the system in a unstable state. It is "
"strongly adviced to continue the operation. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:67
msgid "Reboot required"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
"The upgrade is finished now. A reboot is required to now, do you want to do "
"this now?"
@@ -587,42 +624,67 @@ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:3
-msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgid "<b><big>Start the upgrade?</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:4
-msgid "Cleaning up"
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
+"span>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
#, fuzzy
msgid "Details"
msgstr "<b>Yksityiskohdat</b>"
-#: ../DistUpgrade/DistUpgrade.glade.h:6
-msgid "Preparing upgrade"
-msgstr ""
-
#: ../DistUpgrade/DistUpgrade.glade.h:7
-msgid "Terminal"
+msgid "Downloading and installing the upgrades"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:8
-msgid "Upgrading Ubuntu"
+msgid "Modifing the software channels"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:9
-msgid "Upgrading software channels"
+msgid "Preparing the upgrade"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Upgrading the system"
+msgid "Terminal"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
msgid "_Restart Now"
msgstr ""
+#, fuzzy
+#~ msgid "<b>Sources</b>"
+#~ msgstr "<b>Ohjelmalähteet</b>"
+
+#, fuzzy
+#~ msgid "Automatically check for updates"
+#~ msgstr "Tarkista ohjelma_päivitykset automaattisesti."
+
+#, fuzzy
+#~ msgid "Cancel downloading of the changelog"
+#~ msgstr "Keskeytä muutosluettelon lataus"
+
+#~ msgid "Choose a key-file"
+#~ msgstr "Valitse avaintiedosto"
+
#~ msgid "<b>Packages to install:</b>"
#~ msgstr "<b>Asennettavat paketit:</b>"
@@ -807,9 +869,6 @@ msgstr ""
#~ msgid "The updates are being applied."
#~ msgstr "Päivityksiä asennetaan."
-#~ msgid "Another package manager is running"
-#~ msgstr "Toinen pakettienhallinta on käynnissä"
-
#~ msgid ""
#~ "You can run only one package management application at the same time. "
#~ "Please close this other application first."
@@ -875,9 +934,6 @@ msgstr ""
#~ msgid "Ubuntu Update Manager"
#~ msgstr "Ubuntun päivitysten hallinta"
-#~ msgid "Reload the package information from the server."
-#~ msgstr "Lataa pakettitiedot uudelleen palvelimelta."
-
#~ msgid "Binary"
#~ msgstr "Binääri"
diff --git a/po/fr.po b/po/fr.po
index 902f6757..25934f7a 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: \n"
-"POT-Creation-Date: 2006-01-26 15:51+0100\n"
+"POT-Creation-Date: 2006-02-08 21:14+0100\n"
"PO-Revision-Date: 2005-04-04 19:43+0200\n"
"Last-Translator: \n"
"Language-Team: French <gnomefr@traduc.org>\n"
@@ -18,18 +18,18 @@ msgstr ""
#: ../data/SoftwareProperties.glade.h:1
#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Mise à jour par Internet</b>"
+msgid "<b>Channels</b>"
+msgstr "<b>Détails</b>"
#: ../data/SoftwareProperties.glade.h:2
#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Détails</b>"
+msgid "<b>Internet updates</b>"
+msgstr "<b>Mise à jour par Internet</b>"
#: ../data/SoftwareProperties.glade.h:3
#, fuzzy
-msgid "<b>Sources</b>"
-msgstr "<b>Sources des logiciels</b>"
+msgid "<b>Keys</b>"
+msgstr "<b>Détails</b>"
#: ../data/SoftwareProperties.glade.h:4
#, fuzzy
@@ -42,9 +42,8 @@ msgid "Authentication"
msgstr "A_uthentification"
#: ../data/SoftwareProperties.glade.h:6
-#, fuzzy
-msgid "Automatically check for updates"
-msgstr "Vérifier automatiquement les mises à jo_ur des logiciels."
+msgid "D_elete downloaded software files:"
+msgstr ""
#: ../data/SoftwareProperties.glade.h:7
#, fuzzy
@@ -58,35 +57,56 @@ msgstr "Installation des mises à jour..."
#: ../data/SoftwareProperties.glade.h:9
#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Mise à jour par Internet</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+#, fuzzy
msgid "Restore _Defaults"
msgstr "Restaurer les clés par défaut"
-#: ../data/SoftwareProperties.glade.h:10
+#: ../data/SoftwareProperties.glade.h:11
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/SoftwareProperties.glade.h:11
+#: ../data/SoftwareProperties.glade.h:12
msgid "Software Preferences"
msgstr "Préférences du logiciel"
-#: ../data/SoftwareProperties.glade.h:12
-msgid ""
-"daily\n"
-"every two days\n"
-"weekly\n"
-"every two weeks\n"
-"custom"
+#: ../data/SoftwareProperties.glade.h:13
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Install new updates without confirmation"
msgstr ""
#: ../data/UpdateManager.glade.h:1
-msgid "<big><b>Install software updates</b></big>"
+msgid ""
+"<b><big>You need to manually reload the latest information about updates</"
+"big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
msgstr ""
-#: ../data/UpdateManager.glade.h:2
-msgid "<big><b>Reading package information</b></big>"
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
-#: ../data/UpdateManager.glade.h:3
+#: ../data/UpdateManager.glade.h:8
msgid ""
"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
"\n"
@@ -96,57 +116,60 @@ msgstr ""
"\n"
"Il est nécessaire de récupérer les changement du serveur central"
-#: ../data/UpdateManager.glade.h:6
-#, fuzzy
-msgid "Cancel downloading of the changelog"
-msgstr "Annuler le téléchargement du changelog"
+#: ../data/UpdateManager.glade.h:11
+msgid "Cancel _Download"
+msgstr ""
-#: ../data/UpdateManager.glade.h:7
+#: ../data/UpdateManager.glade.h:12
msgid "Changes"
msgstr "Changements"
-#: ../data/UpdateManager.glade.h:8
+#: ../data/UpdateManager.glade.h:13
msgid "Description"
msgstr "Description"
-#: ../data/UpdateManager.glade.h:9
-msgid ""
-"Reading information about the installed packages. Depending on the speed of "
-"your computer this may take a bit."
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:14
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:15
+#, fuzzy
+msgid "Reload the latest information about updates"
+msgstr "Recharger les informations des paquets depuis le serveur"
+
+#: ../data/UpdateManager.glade.h:16
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:17
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:18
msgid "Software Updates"
msgstr "Mises à jour des logiciels"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:19
msgid ""
-"Software updates can fix possible security holes, fix possible errors, so "
-"called \"bugs\", or provide new features to you."
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "U_pgrade"
msgstr "Mise à jour terminée"
-#: ../data/UpdateManager.glade.h:16
-msgid "_Install"
+#: ../data/UpdateManager.glade.h:21
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:22
+#, fuzzy
+msgid "_Install Updates"
msgstr "_Installer"
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:23
#, fuzzy
msgid "_Reload"
msgstr "Recharger"
@@ -159,13 +182,15 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Breezy 6.04 \"Dapper Drake\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgstr "Ubuntu 5.04 Mises à jour de sécurité"
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Breezy 5.10 \"Breezy Badger\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Ubuntu 5.04 Mises à jour de sécurité"
#. Description
#: ../channels/Ubuntu.info.in:40
@@ -258,31 +283,41 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:237
-msgid "Choose a key-file"
-msgstr "Choisir un fichier de clé"
+#: ../SoftwareProperties/SoftwareProperties.py:102
+#, python-format
+msgid "Every %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:132
+#, python-format
+msgid "After %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:330
+msgid "Import key"
+msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:247
+#: ../SoftwareProperties/SoftwareProperties.py:340
msgid "Error importing selected file"
msgstr "Erreur lors du chargement du fichier sélectionné"
-#: ../SoftwareProperties/SoftwareProperties.py:248
+#: ../SoftwareProperties/SoftwareProperties.py:341
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 un clé GPG ou alors il est "
"corrompu."
-#: ../SoftwareProperties/SoftwareProperties.py:260
+#: ../SoftwareProperties/SoftwareProperties.py:353
msgid "Error removing the key"
msgstr "Erreur lors de la suppression de la clé"
-#: ../SoftwareProperties/SoftwareProperties.py:261
+#: ../SoftwareProperties/SoftwareProperties.py:354
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"La clé que vous avez sélectionné ne peut être supprimé. Veuillez envoyer "
"ceci comme étant un bug."
-#: ../SoftwareProperties/SoftwareProperties.py:304
+#: ../SoftwareProperties/SoftwareProperties.py:397
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -290,38 +325,38 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:354
+#: ../SoftwareProperties/SoftwareProperties.py:447
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:463
msgid "Please insert a disc in the drive:"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:87
+#: ../DistUpgrade/DistUpgradeCache.py:92
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:88
+#: ../DistUpgrade/DistUpgradeCache.py:93
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:101
+#: ../DistUpgrade/DistUpgradeCache.py:135
msgid "Can't upgrade required meta-packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:103
+#: ../DistUpgrade/DistUpgradeCache.py:142
msgid "A essential package would have to be removed"
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:106
+#: ../DistUpgrade/DistUpgradeCache.py:145
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:107
+#: ../DistUpgrade/DistUpgradeCache.py:146
#, fuzzy
msgid ""
"A unresolvable problem occured while calculating the upgrade. Please report "
@@ -331,23 +366,23 @@ msgstr ""
"ceci comme étant un bug."
#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:129
+#: ../DistUpgrade/DistUpgradeCache.py:168
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:130
+#: ../DistUpgrade/DistUpgradeCache.py:169
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:232
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:194
+#: ../DistUpgrade/DistUpgradeCache.py:233
#, fuzzy
msgid ""
"It was impossible to install a required package. Please report this as a "
@@ -357,11 +392,11 @@ msgstr ""
"ceci comme étant un bug."
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:201
+#: ../DistUpgrade/DistUpgradeCache.py:240
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:202
+#: ../DistUpgrade/DistUpgradeCache.py:241
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
"desktop package and it was not possible to detect which version of ubuntu "
@@ -375,81 +410,81 @@ msgid "Reading cache"
msgstr ""
#. FIXME: offer to write a new self.sources.list entry
-#: ../DistUpgrade/DistUpgradeControler.py:113
+#: ../DistUpgrade/DistUpgradeControler.py:107
msgid "No valid entry found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:114
+#: ../DistUpgrade/DistUpgradeControler.py:108
msgid ""
"While scaning your repository information no valid entry for the upgrade was "
"found.\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:129
+#: ../DistUpgrade/DistUpgradeControler.py:125
msgid "Repository information invalid"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:130
+#: ../DistUpgrade/DistUpgradeControler.py:126
msgid ""
"Upgrading the repository information resulted in a invalid file. Please "
"report this as a bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:166
+#: ../DistUpgrade/DistUpgradeControler.py:171
#, fuzzy
msgid "Error during update"
msgstr "Erreur lors de la suppression de la clé"
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:172
msgid ""
"A problem occured during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:186
+#: ../DistUpgrade/DistUpgradeControler.py:190
msgid "Not enough free space"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:187
+#: ../DistUpgrade/DistUpgradeControler.py:191
msgid ""
"There is not enough free space on your system to download the required "
"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
"clean'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:192
+#: ../DistUpgrade/DistUpgradeControler.py:196
#, fuzzy
msgid "Perform Upgrade?"
msgstr "Mise à jour terminée"
#. installing the packages failed, can't be retried
-#: ../DistUpgrade/DistUpgradeControler.py:206
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:280
msgid "Error during commit"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:207
+#: ../DistUpgrade/DistUpgradeControler.py:212
msgid ""
"Some problem occured during the upgrade. Most likely packages failed to "
"install. Try 'sudo apt-get install -f' or synaptic to fix your system."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:223
+#: ../DistUpgrade/DistUpgradeControler.py:228
#, fuzzy
msgid "Error fetching the packages"
msgstr "Erreur lors de la suppression de la clé"
-#: ../DistUpgrade/DistUpgradeControler.py:224
+#: ../DistUpgrade/DistUpgradeControler.py:229
msgid ""
"Some problem occured during the fetching of the packages. This is most "
"likely a network problem. Please check your network and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:273
msgid "Remove obsolete Packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:264
+#: ../DistUpgrade/DistUpgradeControler.py:281
msgid ""
"Some problem occured during the clean-up. Please see the below message for "
"more information. "
@@ -457,50 +492,54 @@ msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:279
-#: ../DistUpgrade/DistUpgradeControler.py:298
-msgid "Checking update system"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:295
+#: ../DistUpgrade/DistUpgradeControler.py:318
+#, fuzzy
+msgid "Checking package manager"
+msgstr "Un autre gestionnaire de paquets est en fonctionnement"
-#: ../DistUpgrade/DistUpgradeControler.py:290
+#: ../DistUpgrade/DistUpgradeControler.py:310
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:324
msgid "Asking for confirmation"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:308
+#: ../DistUpgrade/DistUpgradeControler.py:328
#, fuzzy
msgid "Upgrading"
msgstr "Mise à jour terminée"
-#: ../DistUpgrade/DistUpgradeControler.py:315
+#: ../DistUpgrade/DistUpgradeControler.py:335
msgid "Searching for obsolete software"
msgstr ""
-#. done, ask for reboot
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:340
msgid "System upgrade is complete."
msgstr ""
#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:70
+#: ../DistUpgrade/DistUpgradeViewGtk.py:76
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#: ../DistUpgrade/DistUpgradeViewGtk.py:94
+msgid "Download is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:105
#, python-format
msgid "Downloading file %li of %li with %s/s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:101
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
#, python-format
msgid "%s remaining"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:103
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
#, python-format
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
@@ -508,33 +547,32 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:126
-msgid "Installing updates ..."
-msgstr ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:131
+#, fuzzy
+msgid "Installing updates"
+msgstr "Installation des mises à jour..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:139
+#: ../DistUpgrade/DistUpgradeViewGtk.py:144
#, python-format
-msgid "Error installing '%s'"
+msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
-msgid ""
-"During the install a error occured. This is usually a bug in the packages, "
-"please report it. See the message below for more information. "
+#: ../DistUpgrade/DistUpgradeViewGtk.py:145
+msgid "The upgrade will abort. Please report the bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:224
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:225
+#: ../DistUpgrade/DistUpgradeViewGtk.py:217
msgid ""
"During the operation a fatal error occured. Please report this as a bug and "
"include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your "
"report. The upgrade will abort now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:305
+#: ../DistUpgrade/DistUpgradeViewGtk.py:293
#, python-format
msgid ""
"%s packages are going to be removed.\n"
@@ -544,37 +582,37 @@ msgid ""
"%s needs to be fetched"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:316
+#: ../DistUpgrade/DistUpgradeViewGtk.py:304
#, python-format
msgid "<b>To be removed: %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:318
+#: ../DistUpgrade/DistUpgradeViewGtk.py:306
#, python-format
msgid "To be installed: %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:308
#, python-format
msgid "To be upgraded: %s"
msgstr ""
#. print "on_window_main_delete_event()"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:351
+#: ../DistUpgrade/DistUpgradeViewGtk.py:339
msgid "Are you sure you want cancel?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:340
msgid ""
"Canceling during a upgrade can leave the system in a unstable state. It is "
"strongly adviced to continue the operation. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:67
msgid "Reboot required"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
"The upgrade is finished now. A reboot is required to now, do you want to do "
"this now?"
@@ -593,42 +631,67 @@ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:3
-msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgid "<b><big>Start the upgrade?</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:4
-msgid "Cleaning up"
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
+"span>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
#, fuzzy
msgid "Details"
msgstr "<b>Détails</b>"
-#: ../DistUpgrade/DistUpgrade.glade.h:6
-msgid "Preparing upgrade"
-msgstr ""
-
#: ../DistUpgrade/DistUpgrade.glade.h:7
-msgid "Terminal"
+msgid "Downloading and installing the upgrades"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:8
-msgid "Upgrading Ubuntu"
+msgid "Modifing the software channels"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:9
-msgid "Upgrading software channels"
+msgid "Preparing the upgrade"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Upgrading the system"
+msgid "Terminal"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
msgid "_Restart Now"
msgstr ""
+#, fuzzy
+#~ msgid "<b>Sources</b>"
+#~ msgstr "<b>Sources des logiciels</b>"
+
+#, fuzzy
+#~ msgid "Automatically check for updates"
+#~ msgstr "Vérifier automatiquement les mises à jo_ur des logiciels."
+
+#, fuzzy
+#~ msgid "Cancel downloading of the changelog"
+#~ msgstr "Annuler le téléchargement du changelog"
+
+#~ msgid "Choose a key-file"
+#~ msgstr "Choisir un fichier de clé"
+
#~ msgid "<b>Packages to install:</b>"
#~ msgstr "<b>Paquets à installer :</b>"
@@ -822,9 +885,6 @@ msgstr ""
#~ msgid "The updates are being applied."
#~ msgstr "Les mises à jour ont été appliquées."
-#~ msgid "Another package manager is running"
-#~ msgstr "Un autre gestionnaire de paquets est en fonctionnement"
-
#~ msgid ""
#~ "You can run only one package management application at the same time. "
#~ "Please close this other application first."
@@ -893,9 +953,6 @@ msgstr ""
#~ msgid "Ubuntu Update Manager"
#~ msgstr "Gestionnaire de mises à jour d'Ubuntu"
-#~ msgid "Reload the package information from the server."
-#~ msgstr "Recharger les informations des paquets depuis le serveur"
-
#~ msgid "Binary"
#~ msgstr "Binaire"
diff --git a/po/hu.po b/po/hu.po
index 8cc6f50e..0cd73f62 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: \n"
-"POT-Creation-Date: 2006-01-26 15:51+0100\n"
+"POT-Creation-Date: 2006-02-08 21:14+0100\n"
"PO-Revision-Date: 2005-04-03 12:32+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
"Language-Team: Hungarian <gnome@gnome.hu>\n"
@@ -19,18 +19,18 @@ msgstr ""
#: ../data/SoftwareProperties.glade.h:1
#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Internetes frissítések</b>"
+msgid "<b>Channels</b>"
+msgstr "<b>Részletek</b>"
#: ../data/SoftwareProperties.glade.h:2
#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Részletek</b>"
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internetes frissítések</b>"
#: ../data/SoftwareProperties.glade.h:3
#, fuzzy
-msgid "<b>Sources</b>"
-msgstr "<b>Szoftverforrások</b>"
+msgid "<b>Keys</b>"
+msgstr "<b>Részletek</b>"
#: ../data/SoftwareProperties.glade.h:4
#, fuzzy
@@ -43,9 +43,8 @@ msgid "Authentication"
msgstr "_Hitelesítés"
#: ../data/SoftwareProperties.glade.h:6
-#, fuzzy
-msgid "Automatically check for updates"
-msgstr "Szoftverfrissítések a_utomatikus keresése."
+msgid "D_elete downloaded software files:"
+msgstr ""
#: ../data/SoftwareProperties.glade.h:7
#, fuzzy
@@ -59,35 +58,56 @@ msgstr "Frissítések telepítése..."
#: ../data/SoftwareProperties.glade.h:9
#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Internetes frissítések</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+#, fuzzy
msgid "Restore _Defaults"
msgstr "Alapértelmezett kulcsok visszaállítása"
-#: ../data/SoftwareProperties.glade.h:10
+#: ../data/SoftwareProperties.glade.h:11
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/SoftwareProperties.glade.h:11
+#: ../data/SoftwareProperties.glade.h:12
msgid "Software Preferences"
msgstr "Szoftver beállításai"
-#: ../data/SoftwareProperties.glade.h:12
-msgid ""
-"daily\n"
-"every two days\n"
-"weekly\n"
-"every two weeks\n"
-"custom"
+#: ../data/SoftwareProperties.glade.h:13
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Install new updates without confirmation"
msgstr ""
#: ../data/UpdateManager.glade.h:1
-msgid "<big><b>Install software updates</b></big>"
+msgid ""
+"<b><big>You need to manually reload the latest information about updates</"
+"big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
msgstr ""
-#: ../data/UpdateManager.glade.h:2
-msgid "<big><b>Reading package information</b></big>"
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
-#: ../data/UpdateManager.glade.h:3
+#: ../data/UpdateManager.glade.h:8
msgid ""
"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
"\n"
@@ -97,57 +117,60 @@ msgstr ""
"\n"
"A módosításokat le kell tölteni a központi kiszolgálóról "
-#: ../data/UpdateManager.glade.h:6
-#, fuzzy
-msgid "Cancel downloading of the changelog"
-msgstr "A módosítások listájának letöltésének megszakítása"
+#: ../data/UpdateManager.glade.h:11
+msgid "Cancel _Download"
+msgstr ""
-#: ../data/UpdateManager.glade.h:7
+#: ../data/UpdateManager.glade.h:12
msgid "Changes"
msgstr "Módosítások"
-#: ../data/UpdateManager.glade.h:8
+#: ../data/UpdateManager.glade.h:13
msgid "Description"
msgstr "Leírás"
-#: ../data/UpdateManager.glade.h:9
-msgid ""
-"Reading information about the installed packages. Depending on the speed of "
-"your computer this may take a bit."
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:14
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:15
+#, fuzzy
+msgid "Reload the latest information about updates"
+msgstr "A csomaginformációk ismételt letöltése a kiszolgálóról."
+
+#: ../data/UpdateManager.glade.h:16
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:17
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:18
msgid "Software Updates"
msgstr "Szoftverfrissítések"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:19
msgid ""
-"Software updates can fix possible security holes, fix possible errors, so "
-"called \"bugs\", or provide new features to you."
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "U_pgrade"
msgstr "A frissítés befejeződött"
-#: ../data/UpdateManager.glade.h:16
-msgid "_Install"
+#: ../data/UpdateManager.glade.h:21
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:22
+#, fuzzy
+msgid "_Install Updates"
msgstr "_Telepítés"
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:23
#, fuzzy
msgid "_Reload"
msgstr "Újratöltés"
@@ -160,13 +183,15 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Breezy 6.04 \"Dapper Drake\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgstr "Ubuntu 5.04 biztonsági frissítések"
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Breezy 5.10 \"Breezy Badger\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Ubuntu 5.04 biztonsági frissítések"
#. Description
#: ../channels/Ubuntu.info.in:40
@@ -259,28 +284,38 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:237
-msgid "Choose a key-file"
-msgstr "Válasszon egy kulcsfájlt"
+#: ../SoftwareProperties/SoftwareProperties.py:102
+#, python-format
+msgid "Every %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:132
+#, python-format
+msgid "After %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:330
+msgid "Import key"
+msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:247
+#: ../SoftwareProperties/SoftwareProperties.py:340
msgid "Error importing selected file"
msgstr "Hiba a kiválasztott fájl importálása közben"
-#: ../SoftwareProperties/SoftwareProperties.py:248
+#: ../SoftwareProperties/SoftwareProperties.py:341
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:260
+#: ../SoftwareProperties/SoftwareProperties.py:353
msgid "Error removing the key"
msgstr "Hiba a kulcs eltávolítása közben"
-#: ../SoftwareProperties/SoftwareProperties.py:261
+#: ../SoftwareProperties/SoftwareProperties.py:354
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:304
+#: ../SoftwareProperties/SoftwareProperties.py:397
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -288,38 +323,38 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:354
+#: ../SoftwareProperties/SoftwareProperties.py:447
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:463
msgid "Please insert a disc in the drive:"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:87
+#: ../DistUpgrade/DistUpgradeCache.py:92
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:88
+#: ../DistUpgrade/DistUpgradeCache.py:93
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:101
+#: ../DistUpgrade/DistUpgradeCache.py:135
msgid "Can't upgrade required meta-packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:103
+#: ../DistUpgrade/DistUpgradeCache.py:142
msgid "A essential package would have to be removed"
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:106
+#: ../DistUpgrade/DistUpgradeCache.py:145
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:107
+#: ../DistUpgrade/DistUpgradeCache.py:146
#, fuzzy
msgid ""
"A unresolvable problem occured while calculating the upgrade. Please report "
@@ -328,23 +363,23 @@ msgstr ""
"Az Ön által kijelölt kulcs nem távolítható el. Kérem jelentse ezt hibaként."
#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:129
+#: ../DistUpgrade/DistUpgradeCache.py:168
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:130
+#: ../DistUpgrade/DistUpgradeCache.py:169
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:232
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:194
+#: ../DistUpgrade/DistUpgradeCache.py:233
#, fuzzy
msgid ""
"It was impossible to install a required package. Please report this as a "
@@ -353,11 +388,11 @@ msgstr ""
"Az Ön által kijelölt kulcs nem távolítható el. Kérem jelentse ezt hibaként."
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:201
+#: ../DistUpgrade/DistUpgradeCache.py:240
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:202
+#: ../DistUpgrade/DistUpgradeCache.py:241
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
"desktop package and it was not possible to detect which version of ubuntu "
@@ -371,81 +406,81 @@ msgid "Reading cache"
msgstr ""
#. FIXME: offer to write a new self.sources.list entry
-#: ../DistUpgrade/DistUpgradeControler.py:113
+#: ../DistUpgrade/DistUpgradeControler.py:107
msgid "No valid entry found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:114
+#: ../DistUpgrade/DistUpgradeControler.py:108
msgid ""
"While scaning your repository information no valid entry for the upgrade was "
"found.\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:129
+#: ../DistUpgrade/DistUpgradeControler.py:125
msgid "Repository information invalid"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:130
+#: ../DistUpgrade/DistUpgradeControler.py:126
msgid ""
"Upgrading the repository information resulted in a invalid file. Please "
"report this as a bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:166
+#: ../DistUpgrade/DistUpgradeControler.py:171
#, fuzzy
msgid "Error during update"
msgstr "Hiba a kulcs eltávolítása közben"
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:172
msgid ""
"A problem occured during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:186
+#: ../DistUpgrade/DistUpgradeControler.py:190
msgid "Not enough free space"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:187
+#: ../DistUpgrade/DistUpgradeControler.py:191
msgid ""
"There is not enough free space on your system to download the required "
"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
"clean'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:192
+#: ../DistUpgrade/DistUpgradeControler.py:196
#, fuzzy
msgid "Perform Upgrade?"
msgstr "A frissítés befejeződött"
#. installing the packages failed, can't be retried
-#: ../DistUpgrade/DistUpgradeControler.py:206
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:280
msgid "Error during commit"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:207
+#: ../DistUpgrade/DistUpgradeControler.py:212
msgid ""
"Some problem occured during the upgrade. Most likely packages failed to "
"install. Try 'sudo apt-get install -f' or synaptic to fix your system."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:223
+#: ../DistUpgrade/DistUpgradeControler.py:228
#, fuzzy
msgid "Error fetching the packages"
msgstr "Hiba a kulcs eltávolítása közben"
-#: ../DistUpgrade/DistUpgradeControler.py:224
+#: ../DistUpgrade/DistUpgradeControler.py:229
msgid ""
"Some problem occured during the fetching of the packages. This is most "
"likely a network problem. Please check your network and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:273
msgid "Remove obsolete Packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:264
+#: ../DistUpgrade/DistUpgradeControler.py:281
msgid ""
"Some problem occured during the clean-up. Please see the below message for "
"more information. "
@@ -453,50 +488,54 @@ msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:279
-#: ../DistUpgrade/DistUpgradeControler.py:298
-msgid "Checking update system"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:295
+#: ../DistUpgrade/DistUpgradeControler.py:318
+#, fuzzy
+msgid "Checking package manager"
+msgstr "Már fut egy másik csomagkezelő"
-#: ../DistUpgrade/DistUpgradeControler.py:290
+#: ../DistUpgrade/DistUpgradeControler.py:310
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:324
msgid "Asking for confirmation"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:308
+#: ../DistUpgrade/DistUpgradeControler.py:328
#, fuzzy
msgid "Upgrading"
msgstr "A frissítés befejeződött"
-#: ../DistUpgrade/DistUpgradeControler.py:315
+#: ../DistUpgrade/DistUpgradeControler.py:335
msgid "Searching for obsolete software"
msgstr ""
-#. done, ask for reboot
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:340
msgid "System upgrade is complete."
msgstr ""
#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:70
+#: ../DistUpgrade/DistUpgradeViewGtk.py:76
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#: ../DistUpgrade/DistUpgradeViewGtk.py:94
+msgid "Download is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:105
#, python-format
msgid "Downloading file %li of %li with %s/s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:101
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
#, python-format
msgid "%s remaining"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:103
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
#, python-format
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
@@ -504,33 +543,32 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:126
-msgid "Installing updates ..."
-msgstr ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:131
+#, fuzzy
+msgid "Installing updates"
+msgstr "Frissítések telepítése..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:139
+#: ../DistUpgrade/DistUpgradeViewGtk.py:144
#, python-format
-msgid "Error installing '%s'"
+msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
-msgid ""
-"During the install a error occured. This is usually a bug in the packages, "
-"please report it. See the message below for more information. "
+#: ../DistUpgrade/DistUpgradeViewGtk.py:145
+msgid "The upgrade will abort. Please report the bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:224
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:225
+#: ../DistUpgrade/DistUpgradeViewGtk.py:217
msgid ""
"During the operation a fatal error occured. Please report this as a bug and "
"include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your "
"report. The upgrade will abort now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:305
+#: ../DistUpgrade/DistUpgradeViewGtk.py:293
#, python-format
msgid ""
"%s packages are going to be removed.\n"
@@ -540,37 +578,37 @@ msgid ""
"%s needs to be fetched"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:316
+#: ../DistUpgrade/DistUpgradeViewGtk.py:304
#, python-format
msgid "<b>To be removed: %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:318
+#: ../DistUpgrade/DistUpgradeViewGtk.py:306
#, python-format
msgid "To be installed: %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:308
#, python-format
msgid "To be upgraded: %s"
msgstr ""
#. print "on_window_main_delete_event()"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:351
+#: ../DistUpgrade/DistUpgradeViewGtk.py:339
msgid "Are you sure you want cancel?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:340
msgid ""
"Canceling during a upgrade can leave the system in a unstable state. It is "
"strongly adviced to continue the operation. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:67
msgid "Reboot required"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
"The upgrade is finished now. A reboot is required to now, do you want to do "
"this now?"
@@ -589,42 +627,67 @@ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:3
-msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgid "<b><big>Start the upgrade?</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:4
-msgid "Cleaning up"
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
+"span>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
#, fuzzy
msgid "Details"
msgstr "<b>Részletek</b>"
-#: ../DistUpgrade/DistUpgrade.glade.h:6
-msgid "Preparing upgrade"
-msgstr ""
-
#: ../DistUpgrade/DistUpgrade.glade.h:7
-msgid "Terminal"
+msgid "Downloading and installing the upgrades"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:8
-msgid "Upgrading Ubuntu"
+msgid "Modifing the software channels"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:9
-msgid "Upgrading software channels"
+msgid "Preparing the upgrade"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Upgrading the system"
+msgid "Terminal"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
msgid "_Restart Now"
msgstr ""
+#, fuzzy
+#~ msgid "<b>Sources</b>"
+#~ msgstr "<b>Szoftverforrások</b>"
+
+#, fuzzy
+#~ msgid "Automatically check for updates"
+#~ msgstr "Szoftverfrissítések a_utomatikus keresése."
+
+#, fuzzy
+#~ msgid "Cancel downloading of the changelog"
+#~ msgstr "A módosítások listájának letöltésének megszakítása"
+
+#~ msgid "Choose a key-file"
+#~ msgstr "Válasszon egy kulcsfájlt"
+
#~ msgid "<b>Packages to install:</b>"
#~ msgstr "<b>Telepítendő csomagok:</b>"
@@ -816,9 +879,6 @@ msgstr ""
#~ msgid "The updates are being applied."
#~ msgstr "A frissítések alkalmazása folyamatban."
-#~ msgid "Another package manager is running"
-#~ msgstr "Már fut egy másik csomagkezelő"
-
#~ msgid ""
#~ "You can run only one package management application at the same time. "
#~ "Please close this other application first."
@@ -887,9 +947,6 @@ msgstr ""
#~ msgid "Ubuntu Update Manager"
#~ msgstr "Ubuntu frissítéskezelő"
-#~ msgid "Reload the package information from the server."
-#~ msgstr "A csomaginformációk ismételt letöltése a kiszolgálóról."
-
#~ msgid "Binary"
#~ msgstr "Bináris"
diff --git a/po/ja.po b/po/ja.po
index 6ad03029..7e59bbb6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-26 15:51+0100\n"
+"POT-Creation-Date: 2006-02-08 21:14+0100\n"
"PO-Revision-Date: 2005-10-12 17:28+0900\n"
"Last-Translator: Ikuya Awashiro <ikuya@fruitsbasket.info>\n"
"Language-Team: Ubuntu-ja <ubuntu-ja-users@freeml.com>\n"
@@ -19,18 +19,18 @@ msgstr ""
#: ../data/SoftwareProperties.glade.h:1
#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>インターネットアップデート</b>"
+msgid "<b>Channels</b>"
+msgstr "<b>詳細</b>"
#: ../data/SoftwareProperties.glade.h:2
#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>詳細</b>"
+msgid "<b>Internet updates</b>"
+msgstr "<b>インターネットアップデート</b>"
#: ../data/SoftwareProperties.glade.h:3
#, fuzzy
-msgid "<b>Sources</b>"
-msgstr "<b>ソフトウェア取得元</b>"
+msgid "<b>Keys</b>"
+msgstr "<b>詳細</b>"
#: ../data/SoftwareProperties.glade.h:4
#, fuzzy
@@ -42,9 +42,8 @@ msgid "Authentication"
msgstr "認証"
#: ../data/SoftwareProperties.glade.h:6
-#, fuzzy
-msgid "Automatically check for updates"
-msgstr "アップデートを自動的にチェックする(_U)"
+msgid "D_elete downloaded software files:"
+msgstr ""
#: ../data/SoftwareProperties.glade.h:7
#, fuzzy
@@ -58,36 +57,57 @@ msgstr "アップデートをインストール中..."
#: ../data/SoftwareProperties.glade.h:9
#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>インターネットアップデート</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+#, fuzzy
msgid "Restore _Defaults"
msgstr "デフォルトの鍵を元に戻す"
-#: ../data/SoftwareProperties.glade.h:10
+#: ../data/SoftwareProperties.glade.h:11
#, fuzzy
msgid "Restore the default keys of your distribution"
msgstr "デフォルトの鍵を元に戻す"
-#: ../data/SoftwareProperties.glade.h:11
+#: ../data/SoftwareProperties.glade.h:12
msgid "Software Preferences"
msgstr "ソフトウェアの設定"
-#: ../data/SoftwareProperties.glade.h:12
-msgid ""
-"daily\n"
-"every two days\n"
-"weekly\n"
-"every two weeks\n"
-"custom"
+#: ../data/SoftwareProperties.glade.h:13
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Install new updates without confirmation"
msgstr ""
#: ../data/UpdateManager.glade.h:1
-msgid "<big><b>Install software updates</b></big>"
+msgid ""
+"<b><big>You need to manually reload the latest information about updates</"
+"big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
msgstr ""
-#: ../data/UpdateManager.glade.h:2
-msgid "<big><b>Reading package information</b></big>"
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
-#: ../data/UpdateManager.glade.h:3
+#: ../data/UpdateManager.glade.h:8
msgid ""
"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
"\n"
@@ -97,56 +117,59 @@ msgstr ""
"\n"
"中央サーバから変更点を取得する必要があります"
-#: ../data/UpdateManager.glade.h:6
-#, fuzzy
-msgid "Cancel downloading of the changelog"
-msgstr "変更点の取得を中止"
+#: ../data/UpdateManager.glade.h:11
+msgid "Cancel _Download"
+msgstr ""
-#: ../data/UpdateManager.glade.h:7
+#: ../data/UpdateManager.glade.h:12
msgid "Changes"
msgstr "変更点"
-#: ../data/UpdateManager.glade.h:8
+#: ../data/UpdateManager.glade.h:13
msgid "Description"
msgstr "詳細"
-#: ../data/UpdateManager.glade.h:9
-msgid ""
-"Reading information about the installed packages. Depending on the speed of "
-"your computer this may take a bit."
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:14
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:15
+#, fuzzy
+msgid "Reload the latest information about updates"
+msgstr "サーバからパッケージ情報を再度読み込む。"
+
+#: ../data/UpdateManager.glade.h:16
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:17
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:18
msgid "Software Updates"
msgstr "ソフトウェアのアップデート"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:19
msgid ""
-"Software updates can fix possible security holes, fix possible errors, so "
-"called \"bugs\", or provide new features to you."
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:20
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:16
-msgid "_Install"
-msgstr "インストール(_I)"
+#: ../data/UpdateManager.glade.h:21
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:22
+#, fuzzy
+msgid "_Install Updates"
+msgstr "アップデートをインストール中..."
+
+#: ../data/UpdateManager.glade.h:23
#, fuzzy
msgid "_Reload"
msgstr "再読込"
@@ -159,13 +182,15 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Breezy 6.04 \"Dapper Drake\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgstr "Ubuntu 5.04 セキュリティアップデート"
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Breezy 5.10 \"Breezy Badger\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Ubuntu 5.04 セキュリティアップデート"
#. Description
#: ../channels/Ubuntu.info.in:40
@@ -256,28 +281,38 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:237
-msgid "Choose a key-file"
-msgstr "キーファイルを選択"
+#: ../SoftwareProperties/SoftwareProperties.py:102
+#, python-format
+msgid "Every %s days"
+msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:247
+#: ../SoftwareProperties/SoftwareProperties.py:132
+#, python-format
+msgid "After %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:330
+msgid "Import key"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:340
msgid "Error importing selected file"
msgstr "選択したファイルのインポートエラー"
-#: ../SoftwareProperties/SoftwareProperties.py:248
+#: ../SoftwareProperties/SoftwareProperties.py:341
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"選択したファイルはGPGキーファイルではないか、壊れている可能性があります。"
-#: ../SoftwareProperties/SoftwareProperties.py:260
+#: ../SoftwareProperties/SoftwareProperties.py:353
msgid "Error removing the key"
msgstr "キー削除のエラー"
-#: ../SoftwareProperties/SoftwareProperties.py:261
+#: ../SoftwareProperties/SoftwareProperties.py:354
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr "選択したキーを削除できませんでした。バグとして報告してください。"
-#: ../SoftwareProperties/SoftwareProperties.py:304
+#: ../SoftwareProperties/SoftwareProperties.py:397
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -285,38 +320,38 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:354
+#: ../SoftwareProperties/SoftwareProperties.py:447
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:463
msgid "Please insert a disc in the drive:"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:87
+#: ../DistUpgrade/DistUpgradeCache.py:92
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:88
+#: ../DistUpgrade/DistUpgradeCache.py:93
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:101
+#: ../DistUpgrade/DistUpgradeCache.py:135
msgid "Can't upgrade required meta-packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:103
+#: ../DistUpgrade/DistUpgradeCache.py:142
msgid "A essential package would have to be removed"
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:106
+#: ../DistUpgrade/DistUpgradeCache.py:145
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:107
+#: ../DistUpgrade/DistUpgradeCache.py:146
#, fuzzy
msgid ""
"A unresolvable problem occured while calculating the upgrade. Please report "
@@ -324,23 +359,23 @@ msgid ""
msgstr "選択したキーを削除できませんでした。バグとして報告してください。"
#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:129
+#: ../DistUpgrade/DistUpgradeCache.py:168
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:130
+#: ../DistUpgrade/DistUpgradeCache.py:169
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:232
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:194
+#: ../DistUpgrade/DistUpgradeCache.py:233
#, fuzzy
msgid ""
"It was impossible to install a required package. Please report this as a "
@@ -348,11 +383,11 @@ msgid ""
msgstr "選択したキーを削除できませんでした。バグとして報告してください。"
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:201
+#: ../DistUpgrade/DistUpgradeCache.py:240
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:202
+#: ../DistUpgrade/DistUpgradeCache.py:241
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
"desktop package and it was not possible to detect which version of ubuntu "
@@ -366,80 +401,80 @@ msgid "Reading cache"
msgstr ""
#. FIXME: offer to write a new self.sources.list entry
-#: ../DistUpgrade/DistUpgradeControler.py:113
+#: ../DistUpgrade/DistUpgradeControler.py:107
msgid "No valid entry found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:114
+#: ../DistUpgrade/DistUpgradeControler.py:108
msgid ""
"While scaning your repository information no valid entry for the upgrade was "
"found.\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:129
+#: ../DistUpgrade/DistUpgradeControler.py:125
msgid "Repository information invalid"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:130
+#: ../DistUpgrade/DistUpgradeControler.py:126
msgid ""
"Upgrading the repository information resulted in a invalid file. Please "
"report this as a bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:166
+#: ../DistUpgrade/DistUpgradeControler.py:171
#, fuzzy
msgid "Error during update"
msgstr "キー削除のエラー"
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:172
msgid ""
"A problem occured during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:186
+#: ../DistUpgrade/DistUpgradeControler.py:190
msgid "Not enough free space"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:187
+#: ../DistUpgrade/DistUpgradeControler.py:191
msgid ""
"There is not enough free space on your system to download the required "
"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
"clean'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:192
+#: ../DistUpgrade/DistUpgradeControler.py:196
msgid "Perform Upgrade?"
msgstr ""
#. installing the packages failed, can't be retried
-#: ../DistUpgrade/DistUpgradeControler.py:206
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:280
msgid "Error during commit"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:207
+#: ../DistUpgrade/DistUpgradeControler.py:212
msgid ""
"Some problem occured during the upgrade. Most likely packages failed to "
"install. Try 'sudo apt-get install -f' or synaptic to fix your system."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:223
+#: ../DistUpgrade/DistUpgradeControler.py:228
#, fuzzy
msgid "Error fetching the packages"
msgstr "キー削除のエラー"
-#: ../DistUpgrade/DistUpgradeControler.py:224
+#: ../DistUpgrade/DistUpgradeControler.py:229
msgid ""
"Some problem occured during the fetching of the packages. This is most "
"likely a network problem. Please check your network and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:273
msgid "Remove obsolete Packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:264
+#: ../DistUpgrade/DistUpgradeControler.py:281
msgid ""
"Some problem occured during the clean-up. Please see the below message for "
"more information. "
@@ -447,50 +482,54 @@ msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:279
-#: ../DistUpgrade/DistUpgradeControler.py:298
-msgid "Checking update system"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:295
+#: ../DistUpgrade/DistUpgradeControler.py:318
+#, fuzzy
+msgid "Checking package manager"
+msgstr "他のパッケージマネージャが動いています"
-#: ../DistUpgrade/DistUpgradeControler.py:290
+#: ../DistUpgrade/DistUpgradeControler.py:310
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:324
msgid "Asking for confirmation"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:308
+#: ../DistUpgrade/DistUpgradeControler.py:328
#, fuzzy
msgid "Upgrading"
msgstr "アップグレードが終了しました"
-#: ../DistUpgrade/DistUpgradeControler.py:315
+#: ../DistUpgrade/DistUpgradeControler.py:335
msgid "Searching for obsolete software"
msgstr ""
-#. done, ask for reboot
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:340
msgid "System upgrade is complete."
msgstr ""
#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:70
+#: ../DistUpgrade/DistUpgradeViewGtk.py:76
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#: ../DistUpgrade/DistUpgradeViewGtk.py:94
+msgid "Download is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:105
#, python-format
msgid "Downloading file %li of %li with %s/s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:101
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
#, python-format
msgid "%s remaining"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:103
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
#, python-format
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
@@ -498,34 +537,32 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:126
+#: ../DistUpgrade/DistUpgradeViewGtk.py:131
#, fuzzy
-msgid "Installing updates ..."
+msgid "Installing updates"
msgstr "アップデートをインストール中..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:139
+#: ../DistUpgrade/DistUpgradeViewGtk.py:144
#, python-format
-msgid "Error installing '%s'"
+msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
-msgid ""
-"During the install a error occured. This is usually a bug in the packages, "
-"please report it. See the message below for more information. "
+#: ../DistUpgrade/DistUpgradeViewGtk.py:145
+msgid "The upgrade will abort. Please report the bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:224
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:225
+#: ../DistUpgrade/DistUpgradeViewGtk.py:217
msgid ""
"During the operation a fatal error occured. Please report this as a bug and "
"include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your "
"report. The upgrade will abort now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:305
+#: ../DistUpgrade/DistUpgradeViewGtk.py:293
#, python-format
msgid ""
"%s packages are going to be removed.\n"
@@ -535,37 +572,37 @@ msgid ""
"%s needs to be fetched"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:316
+#: ../DistUpgrade/DistUpgradeViewGtk.py:304
#, python-format
msgid "<b>To be removed: %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:318
+#: ../DistUpgrade/DistUpgradeViewGtk.py:306
#, python-format
msgid "To be installed: %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:308
#, python-format
msgid "To be upgraded: %s"
msgstr ""
#. print "on_window_main_delete_event()"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:351
+#: ../DistUpgrade/DistUpgradeViewGtk.py:339
msgid "Are you sure you want cancel?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:340
msgid ""
"Canceling during a upgrade can leave the system in a unstable state. It is "
"strongly adviced to continue the operation. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:67
msgid "Reboot required"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
"The upgrade is finished now. A reboot is required to now, do you want to do "
"this now?"
@@ -584,42 +621,70 @@ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:3
-msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgid "<b><big>Start the upgrade?</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:4
-msgid "Cleaning up"
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
+"span>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
#, fuzzy
msgid "Details"
msgstr "<b>詳細</b>"
-#: ../DistUpgrade/DistUpgrade.glade.h:6
-msgid "Preparing upgrade"
-msgstr ""
-
#: ../DistUpgrade/DistUpgrade.glade.h:7
-msgid "Terminal"
+msgid "Downloading and installing the upgrades"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:8
-msgid "Upgrading Ubuntu"
+msgid "Modifing the software channels"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:9
-msgid "Upgrading software channels"
+msgid "Preparing the upgrade"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Upgrading the system"
+msgid "Terminal"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
msgid "_Restart Now"
msgstr ""
+#, fuzzy
+#~ msgid "<b>Sources</b>"
+#~ msgstr "<b>ソフトウェア取得元</b>"
+
+#, fuzzy
+#~ msgid "Automatically check for updates"
+#~ msgstr "アップデートを自動的にチェックする(_U)"
+
+#, fuzzy
+#~ msgid "Cancel downloading of the changelog"
+#~ msgstr "変更点の取得を中止"
+
+#~ msgid "_Install"
+#~ msgstr "インストール(_I)"
+
+#~ msgid "Choose a key-file"
+#~ msgstr "キーファイルを選択"
+
#~ msgid "<b>Comment:</b>"
#~ msgstr "<b>コメント:</b>"
@@ -864,9 +929,6 @@ msgstr ""
#~ msgid "The updates are being applied."
#~ msgstr "アップデートされました。"
-#~ msgid "Another package manager is running"
-#~ msgstr "他のパッケージマネージャが動いています"
-
#~ msgid ""
#~ "You can run only one package management application at the same time. "
#~ "Please close this other application first."
@@ -936,9 +998,6 @@ msgstr ""
#~ msgid "Ubuntu Update Manager"
#~ msgstr "Ubuntuアップデートマネージャ"
-#~ msgid "Reload the package information from the server."
-#~ msgstr "サーバからパッケージ情報を再度読み込む。"
-
#, fuzzy
#~ msgid ""
#~ "<big><b>Available Updates</b></big>\n"
diff --git a/po/pl.po b/po/pl.po
index 93750ada..ec6a2360 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: \n"
-"POT-Creation-Date: 2006-01-26 15:51+0100\n"
+"POT-Creation-Date: 2006-02-08 21:14+0100\n"
"PO-Revision-Date: 2005-03-25 17:23+0100\n"
"Last-Translator: Zygmunt Krynicki <zyga@www.suxx.pl>\n"
"Language-Team: Polish <translators@gnomepl.org>\n"
@@ -17,18 +17,18 @@ msgstr ""
#: ../data/SoftwareProperties.glade.h:1
#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Aktualizacje internetowe</b>"
+msgid "<b>Channels</b>"
+msgstr "<b>Szczegóły</b>"
#: ../data/SoftwareProperties.glade.h:2
#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Szczegóły</b>"
+msgid "<b>Internet updates</b>"
+msgstr "<b>Aktualizacje internetowe</b>"
#: ../data/SoftwareProperties.glade.h:3
#, fuzzy
-msgid "<b>Sources</b>"
-msgstr "<b>Źródła oprogramowania</b>"
+msgid "<b>Keys</b>"
+msgstr "<b>Szczegóły</b>"
#: ../data/SoftwareProperties.glade.h:4
#, fuzzy
@@ -41,9 +41,8 @@ msgid "Authentication"
msgstr "A_utentykacja"
#: ../data/SoftwareProperties.glade.h:6
-#, fuzzy
-msgid "Automatically check for updates"
-msgstr "Automatycznie sprawdzaj dostępność akt_ualizacji oprogramowania."
+msgid "D_elete downloaded software files:"
+msgstr ""
#: ../data/SoftwareProperties.glade.h:7
#, fuzzy
@@ -57,35 +56,56 @@ msgstr "Instalacja pakietów..."
#: ../data/SoftwareProperties.glade.h:9
#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Aktualizacje internetowe</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+#, fuzzy
msgid "Restore _Defaults"
msgstr "Przywraca domyślne klucze"
-#: ../data/SoftwareProperties.glade.h:10
+#: ../data/SoftwareProperties.glade.h:11
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/SoftwareProperties.glade.h:11
+#: ../data/SoftwareProperties.glade.h:12
msgid "Software Preferences"
msgstr "Ustawienia oprogramowania"
-#: ../data/SoftwareProperties.glade.h:12
-msgid ""
-"daily\n"
-"every two days\n"
-"weekly\n"
-"every two weeks\n"
-"custom"
+#: ../data/SoftwareProperties.glade.h:13
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Install new updates without confirmation"
msgstr ""
#: ../data/UpdateManager.glade.h:1
-msgid "<big><b>Install software updates</b></big>"
+msgid ""
+"<b><big>You need to manually reload the latest information about updates</"
+"big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
msgstr ""
-#: ../data/UpdateManager.glade.h:2
-msgid "<big><b>Reading package information</b></big>"
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
-#: ../data/UpdateManager.glade.h:3
+#: ../data/UpdateManager.glade.h:8
msgid ""
"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
"\n"
@@ -95,57 +115,60 @@ msgstr ""
"\n"
"Trzeba pobrać informacje o zmianach z centralnego serwera"
-#: ../data/UpdateManager.glade.h:6
-#, fuzzy
-msgid "Cancel downloading of the changelog"
-msgstr "Anuluj pobieranie pliku zmian (Changelog)"
+#: ../data/UpdateManager.glade.h:11
+msgid "Cancel _Download"
+msgstr ""
-#: ../data/UpdateManager.glade.h:7
+#: ../data/UpdateManager.glade.h:12
msgid "Changes"
msgstr "Zmiany"
-#: ../data/UpdateManager.glade.h:8
+#: ../data/UpdateManager.glade.h:13
msgid "Description"
msgstr "Opis"
-#: ../data/UpdateManager.glade.h:9
-msgid ""
-"Reading information about the installed packages. Depending on the speed of "
-"your computer this may take a bit."
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:14
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:15
+#, fuzzy
+msgid "Reload the latest information about updates"
+msgstr "Wczytuje ponownie z serwera informacje o pakietach."
+
+#: ../data/UpdateManager.glade.h:16
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:17
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:18
msgid "Software Updates"
msgstr "Aktualizacje oprogramowania"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:19
msgid ""
-"Software updates can fix possible security holes, fix possible errors, so "
-"called \"bugs\", or provide new features to you."
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "U_pgrade"
msgstr "Aktualizowanie zakończone"
-#: ../data/UpdateManager.glade.h:16
-msgid "_Install"
+#: ../data/UpdateManager.glade.h:21
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:22
+#, fuzzy
+msgid "_Install Updates"
msgstr "_Instaluj"
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:23
#, fuzzy
msgid "_Reload"
msgstr "Wczytaj ponownie"
@@ -158,13 +181,15 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Breezy 6.04 \"Dapper Drake\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Breezy 5.10 \"Breezy Badger\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:40
@@ -257,27 +282,37 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:237
-msgid "Choose a key-file"
-msgstr "Wybierz plik z kluczem"
+#: ../SoftwareProperties/SoftwareProperties.py:102
+#, python-format
+msgid "Every %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:132
+#, python-format
+msgid "After %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:330
+msgid "Import key"
+msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:247
+#: ../SoftwareProperties/SoftwareProperties.py:340
msgid "Error importing selected file"
msgstr "Błąd podczas importu wybranego pliku"
-#: ../SoftwareProperties/SoftwareProperties.py:248
+#: ../SoftwareProperties/SoftwareProperties.py:341
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:260
+#: ../SoftwareProperties/SoftwareProperties.py:353
msgid "Error removing the key"
msgstr "Błąd podczas usuwania klucza"
-#: ../SoftwareProperties/SoftwareProperties.py:261
+#: ../SoftwareProperties/SoftwareProperties.py:354
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:304
+#: ../SoftwareProperties/SoftwareProperties.py:397
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -285,38 +320,38 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:354
+#: ../SoftwareProperties/SoftwareProperties.py:447
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:463
msgid "Please insert a disc in the drive:"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:87
+#: ../DistUpgrade/DistUpgradeCache.py:92
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:88
+#: ../DistUpgrade/DistUpgradeCache.py:93
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:101
+#: ../DistUpgrade/DistUpgradeCache.py:135
msgid "Can't upgrade required meta-packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:103
+#: ../DistUpgrade/DistUpgradeCache.py:142
msgid "A essential package would have to be removed"
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:106
+#: ../DistUpgrade/DistUpgradeCache.py:145
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:107
+#: ../DistUpgrade/DistUpgradeCache.py:146
#, fuzzy
msgid ""
"A unresolvable problem occured while calculating the upgrade. Please report "
@@ -324,23 +359,23 @@ msgid ""
msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd."
#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:129
+#: ../DistUpgrade/DistUpgradeCache.py:168
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:130
+#: ../DistUpgrade/DistUpgradeCache.py:169
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:232
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:194
+#: ../DistUpgrade/DistUpgradeCache.py:233
#, fuzzy
msgid ""
"It was impossible to install a required package. Please report this as a "
@@ -348,11 +383,11 @@ msgid ""
msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd."
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:201
+#: ../DistUpgrade/DistUpgradeCache.py:240
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:202
+#: ../DistUpgrade/DistUpgradeCache.py:241
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
"desktop package and it was not possible to detect which version of ubuntu "
@@ -366,81 +401,81 @@ msgid "Reading cache"
msgstr ""
#. FIXME: offer to write a new self.sources.list entry
-#: ../DistUpgrade/DistUpgradeControler.py:113
+#: ../DistUpgrade/DistUpgradeControler.py:107
msgid "No valid entry found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:114
+#: ../DistUpgrade/DistUpgradeControler.py:108
msgid ""
"While scaning your repository information no valid entry for the upgrade was "
"found.\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:129
+#: ../DistUpgrade/DistUpgradeControler.py:125
msgid "Repository information invalid"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:130
+#: ../DistUpgrade/DistUpgradeControler.py:126
msgid ""
"Upgrading the repository information resulted in a invalid file. Please "
"report this as a bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:166
+#: ../DistUpgrade/DistUpgradeControler.py:171
#, fuzzy
msgid "Error during update"
msgstr "Błąd podczas usuwania klucza"
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:172
msgid ""
"A problem occured during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:186
+#: ../DistUpgrade/DistUpgradeControler.py:190
msgid "Not enough free space"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:187
+#: ../DistUpgrade/DistUpgradeControler.py:191
msgid ""
"There is not enough free space on your system to download the required "
"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
"clean'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:192
+#: ../DistUpgrade/DistUpgradeControler.py:196
#, fuzzy
msgid "Perform Upgrade?"
msgstr "Aktualizowanie zakończone"
#. installing the packages failed, can't be retried
-#: ../DistUpgrade/DistUpgradeControler.py:206
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:280
msgid "Error during commit"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:207
+#: ../DistUpgrade/DistUpgradeControler.py:212
msgid ""
"Some problem occured during the upgrade. Most likely packages failed to "
"install. Try 'sudo apt-get install -f' or synaptic to fix your system."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:223
+#: ../DistUpgrade/DistUpgradeControler.py:228
#, fuzzy
msgid "Error fetching the packages"
msgstr "Błąd podczas usuwania klucza"
-#: ../DistUpgrade/DistUpgradeControler.py:224
+#: ../DistUpgrade/DistUpgradeControler.py:229
msgid ""
"Some problem occured during the fetching of the packages. This is most "
"likely a network problem. Please check your network and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:273
msgid "Remove obsolete Packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:264
+#: ../DistUpgrade/DistUpgradeControler.py:281
msgid ""
"Some problem occured during the clean-up. Please see the below message for "
"more information. "
@@ -448,50 +483,54 @@ msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:279
-#: ../DistUpgrade/DistUpgradeControler.py:298
-msgid "Checking update system"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:295
+#: ../DistUpgrade/DistUpgradeControler.py:318
+#, fuzzy
+msgid "Checking package manager"
+msgstr "Działa inny menadżer pakietów"
-#: ../DistUpgrade/DistUpgradeControler.py:290
+#: ../DistUpgrade/DistUpgradeControler.py:310
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:324
msgid "Asking for confirmation"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:308
+#: ../DistUpgrade/DistUpgradeControler.py:328
#, fuzzy
msgid "Upgrading"
msgstr "Aktualizowanie zakończone"
-#: ../DistUpgrade/DistUpgradeControler.py:315
+#: ../DistUpgrade/DistUpgradeControler.py:335
msgid "Searching for obsolete software"
msgstr ""
-#. done, ask for reboot
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:340
msgid "System upgrade is complete."
msgstr ""
#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:70
+#: ../DistUpgrade/DistUpgradeViewGtk.py:76
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#: ../DistUpgrade/DistUpgradeViewGtk.py:94
+msgid "Download is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:105
#, python-format
msgid "Downloading file %li of %li with %s/s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:101
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
#, python-format
msgid "%s remaining"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:103
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
#, python-format
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
@@ -499,33 +538,32 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:126
-msgid "Installing updates ..."
-msgstr ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:131
+#, fuzzy
+msgid "Installing updates"
+msgstr "Instalacja pakietów..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:139
+#: ../DistUpgrade/DistUpgradeViewGtk.py:144
#, python-format
-msgid "Error installing '%s'"
+msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
-msgid ""
-"During the install a error occured. This is usually a bug in the packages, "
-"please report it. See the message below for more information. "
+#: ../DistUpgrade/DistUpgradeViewGtk.py:145
+msgid "The upgrade will abort. Please report the bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:224
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:225
+#: ../DistUpgrade/DistUpgradeViewGtk.py:217
msgid ""
"During the operation a fatal error occured. Please report this as a bug and "
"include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your "
"report. The upgrade will abort now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:305
+#: ../DistUpgrade/DistUpgradeViewGtk.py:293
#, python-format
msgid ""
"%s packages are going to be removed.\n"
@@ -535,37 +573,37 @@ msgid ""
"%s needs to be fetched"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:316
+#: ../DistUpgrade/DistUpgradeViewGtk.py:304
#, python-format
msgid "<b>To be removed: %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:318
+#: ../DistUpgrade/DistUpgradeViewGtk.py:306
#, python-format
msgid "To be installed: %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:308
#, python-format
msgid "To be upgraded: %s"
msgstr ""
#. print "on_window_main_delete_event()"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:351
+#: ../DistUpgrade/DistUpgradeViewGtk.py:339
msgid "Are you sure you want cancel?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:340
msgid ""
"Canceling during a upgrade can leave the system in a unstable state. It is "
"strongly adviced to continue the operation. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:67
msgid "Reboot required"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
"The upgrade is finished now. A reboot is required to now, do you want to do "
"this now?"
@@ -584,42 +622,67 @@ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:3
-msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgid "<b><big>Start the upgrade?</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:4
-msgid "Cleaning up"
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
+"span>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
#, fuzzy
msgid "Details"
msgstr "<b>Szczegóły</b>"
-#: ../DistUpgrade/DistUpgrade.glade.h:6
-msgid "Preparing upgrade"
-msgstr ""
-
#: ../DistUpgrade/DistUpgrade.glade.h:7
-msgid "Terminal"
+msgid "Downloading and installing the upgrades"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:8
-msgid "Upgrading Ubuntu"
+msgid "Modifing the software channels"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:9
-msgid "Upgrading software channels"
+msgid "Preparing the upgrade"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Upgrading the system"
+msgid "Terminal"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
msgid "_Restart Now"
msgstr ""
+#, fuzzy
+#~ msgid "<b>Sources</b>"
+#~ msgstr "<b>Źródła oprogramowania</b>"
+
+#, fuzzy
+#~ msgid "Automatically check for updates"
+#~ msgstr "Automatycznie sprawdzaj dostępność akt_ualizacji oprogramowania."
+
+#, fuzzy
+#~ msgid "Cancel downloading of the changelog"
+#~ msgstr "Anuluj pobieranie pliku zmian (Changelog)"
+
+#~ msgid "Choose a key-file"
+#~ msgstr "Wybierz plik z kluczem"
+
#~ msgid "<b>Packages to install:</b>"
#~ msgstr "<b>Pakiety do zainstalowania:</b>"
@@ -815,9 +878,6 @@ msgstr ""
#~ msgid "The updates are being applied."
#~ msgstr "Aktualizacje są teraz instalowane."
-#~ msgid "Another package manager is running"
-#~ msgstr "Działa inny menadżer pakietów"
-
#~ msgid ""
#~ "You can run only one package management application at the same time. "
#~ "Please close this other application first."
@@ -881,9 +941,6 @@ msgstr ""
#~ msgid "Ubuntu Update Manager"
#~ msgstr "Menadżer aktualizacji Ubuntu"
-#~ msgid "Reload the package information from the server."
-#~ msgstr "Wczytuje ponownie z serwera informacje o pakietach."
-
#~ msgid "Binary"
#~ msgstr "Binarny"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index dfebed38..f80dae3d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-26 15:51+0100\n"
+"POT-Creation-Date: 2006-02-08 21:14+0100\n"
"PO-Revision-Date: 2005-03-29 13:36-0300\n"
"Last-Translator: Raphael Higino <raphaelh@uai.com.br>\n"
"Language-Team: Brazilian Portuguese <gnome-l10n-status@listas.cipsga.org."
@@ -17,19 +17,19 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Tipo:</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
msgid "<b>Internet updates</b>"
msgstr ""
-#: ../data/SoftwareProperties.glade.h:2
+#: ../data/SoftwareProperties.glade.h:3
#, fuzzy
msgid "<b>Keys</b>"
msgstr "<b>Tipo:</b>"
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Sources</b>"
-msgstr "<b>Fontes de Software</b>"
-
#: ../data/SoftwareProperties.glade.h:4
#, fuzzy
msgid "Add _Cdrom"
@@ -40,7 +40,7 @@ msgid "Authentication"
msgstr ""
#: ../data/SoftwareProperties.glade.h:6
-msgid "Automatically check for updates"
+msgid "D_elete downloaded software files:"
msgstr ""
#: ../data/SoftwareProperties.glade.h:7
@@ -52,91 +52,113 @@ msgid "Installation Media"
msgstr ""
#: ../data/SoftwareProperties.glade.h:9
-msgid "Restore _Defaults"
+msgid "Internet Updates"
msgstr ""
#: ../data/SoftwareProperties.glade.h:10
-msgid "Restore the default keys of your distribution"
+msgid "Restore _Defaults"
msgstr ""
#: ../data/SoftwareProperties.glade.h:11
-msgid "Software Preferences"
+msgid "Restore the default keys of your distribution"
msgstr ""
#: ../data/SoftwareProperties.glade.h:12
-msgid ""
-"daily\n"
-"every two days\n"
-"weekly\n"
-"every two weeks\n"
-"custom"
+msgid "Software Preferences"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Install new updates without confirmation"
msgstr ""
#: ../data/UpdateManager.glade.h:1
-msgid "<big><b>Install software updates</b></big>"
+msgid ""
+"<b><big>You need to manually reload the latest information about updates</"
+"big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:2
-msgid "<big><b>Reading package information</b></big>"
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
-#: ../data/UpdateManager.glade.h:3
+#: ../data/UpdateManager.glade.h:8
msgid ""
"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
"\n"
"Need to get the changes from the central server"
msgstr ""
-#: ../data/UpdateManager.glade.h:6
-msgid "Cancel downloading of the changelog"
+#: ../data/UpdateManager.glade.h:11
+msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:7
+#: ../data/UpdateManager.glade.h:12
msgid "Changes"
msgstr ""
-#: ../data/UpdateManager.glade.h:8
+#: ../data/UpdateManager.glade.h:13
msgid "Description"
msgstr ""
-#: ../data/UpdateManager.glade.h:9
-msgid ""
-"Reading information about the installed packages. Depending on the speed of "
-"your computer this may take a bit."
+#: ../data/UpdateManager.glade.h:14
+msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:10
-msgid "Release Notes"
+#: ../data/UpdateManager.glade.h:15
+msgid "Reload the latest information about updates"
msgstr ""
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:16
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:17
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:18
msgid "Software Updates"
msgstr ""
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:19
msgid ""
-"Software updates can fix possible security holes, fix possible errors, so "
-"called \"bugs\", or provide new features to you."
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "U_pgrade"
msgstr "Upgrade terminado"
-#: ../data/UpdateManager.glade.h:16
-msgid "_Install"
+#: ../data/UpdateManager.glade.h:21
+msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:22
+msgid "_Install Updates"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:23
msgid "_Reload"
msgstr ""
@@ -148,12 +170,12 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Breezy 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 \"Dapper Drake\""
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Breezy 5.10 \"Breezy Badger\""
+msgid "Ubuntu 5.10 \"Breezy Badger\""
msgstr ""
#. Description
@@ -242,27 +264,37 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:237
-msgid "Choose a key-file"
+#: ../SoftwareProperties/SoftwareProperties.py:102
+#, python-format
+msgid "Every %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:132
+#, python-format
+msgid "After %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:330
+msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:247
+#: ../SoftwareProperties/SoftwareProperties.py:340
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:248
+#: ../SoftwareProperties/SoftwareProperties.py:341
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:260
+#: ../SoftwareProperties/SoftwareProperties.py:353
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:261
+#: ../SoftwareProperties/SoftwareProperties.py:354
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:304
+#: ../SoftwareProperties/SoftwareProperties.py:397
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -270,72 +302,72 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:354
+#: ../SoftwareProperties/SoftwareProperties.py:447
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:463
msgid "Please insert a disc in the drive:"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:87
+#: ../DistUpgrade/DistUpgradeCache.py:92
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:88
+#: ../DistUpgrade/DistUpgradeCache.py:93
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:101
+#: ../DistUpgrade/DistUpgradeCache.py:135
msgid "Can't upgrade required meta-packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:103
+#: ../DistUpgrade/DistUpgradeCache.py:142
msgid "A essential package would have to be removed"
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:106
+#: ../DistUpgrade/DistUpgradeCache.py:145
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:107
+#: ../DistUpgrade/DistUpgradeCache.py:146
msgid ""
"A unresolvable problem occured while calculating the upgrade. Please report "
"this as a bug. "
msgstr ""
#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:129
+#: ../DistUpgrade/DistUpgradeCache.py:168
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:130
+#: ../DistUpgrade/DistUpgradeCache.py:169
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:232
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:194
+#: ../DistUpgrade/DistUpgradeCache.py:233
msgid ""
"It was impossible to install a required package. Please report this as a "
"bug. "
msgstr ""
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:201
+#: ../DistUpgrade/DistUpgradeCache.py:240
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:202
+#: ../DistUpgrade/DistUpgradeCache.py:241
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
"desktop package and it was not possible to detect which version of ubuntu "
@@ -349,79 +381,79 @@ msgid "Reading cache"
msgstr ""
#. FIXME: offer to write a new self.sources.list entry
-#: ../DistUpgrade/DistUpgradeControler.py:113
+#: ../DistUpgrade/DistUpgradeControler.py:107
msgid "No valid entry found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:114
+#: ../DistUpgrade/DistUpgradeControler.py:108
msgid ""
"While scaning your repository information no valid entry for the upgrade was "
"found.\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:129
+#: ../DistUpgrade/DistUpgradeControler.py:125
msgid "Repository information invalid"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:130
+#: ../DistUpgrade/DistUpgradeControler.py:126
msgid ""
"Upgrading the repository information resulted in a invalid file. Please "
"report this as a bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:166
+#: ../DistUpgrade/DistUpgradeControler.py:171
msgid "Error during update"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:172
msgid ""
"A problem occured during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:186
+#: ../DistUpgrade/DistUpgradeControler.py:190
msgid "Not enough free space"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:187
+#: ../DistUpgrade/DistUpgradeControler.py:191
msgid ""
"There is not enough free space on your system to download the required "
"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
"clean'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:192
+#: ../DistUpgrade/DistUpgradeControler.py:196
#, fuzzy
msgid "Perform Upgrade?"
msgstr "Upgrade terminado"
#. installing the packages failed, can't be retried
-#: ../DistUpgrade/DistUpgradeControler.py:206
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:280
msgid "Error during commit"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:207
+#: ../DistUpgrade/DistUpgradeControler.py:212
msgid ""
"Some problem occured during the upgrade. Most likely packages failed to "
"install. Try 'sudo apt-get install -f' or synaptic to fix your system."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:223
+#: ../DistUpgrade/DistUpgradeControler.py:228
msgid "Error fetching the packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:224
+#: ../DistUpgrade/DistUpgradeControler.py:229
msgid ""
"Some problem occured during the fetching of the packages. This is most "
"likely a network problem. Please check your network and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:273
msgid "Remove obsolete Packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:264
+#: ../DistUpgrade/DistUpgradeControler.py:281
msgid ""
"Some problem occured during the clean-up. Please see the below message for "
"more information. "
@@ -429,50 +461,53 @@ msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:279
-#: ../DistUpgrade/DistUpgradeControler.py:298
-msgid "Checking update system"
+#: ../DistUpgrade/DistUpgradeControler.py:295
+#: ../DistUpgrade/DistUpgradeControler.py:318
+msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:290
+#: ../DistUpgrade/DistUpgradeControler.py:310
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:324
msgid "Asking for confirmation"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:308
+#: ../DistUpgrade/DistUpgradeControler.py:328
#, fuzzy
msgid "Upgrading"
msgstr "Upgrade terminado"
-#: ../DistUpgrade/DistUpgradeControler.py:315
+#: ../DistUpgrade/DistUpgradeControler.py:335
msgid "Searching for obsolete software"
msgstr ""
-#. done, ask for reboot
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:340
msgid "System upgrade is complete."
msgstr ""
#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:70
+#: ../DistUpgrade/DistUpgradeViewGtk.py:76
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#: ../DistUpgrade/DistUpgradeViewGtk.py:94
+msgid "Download is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:105
#, python-format
msgid "Downloading file %li of %li with %s/s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:101
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
#, python-format
msgid "%s remaining"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:103
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
#, python-format
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
@@ -480,33 +515,31 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:126
-msgid "Installing updates ..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:131
+msgid "Installing updates"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:139
+#: ../DistUpgrade/DistUpgradeViewGtk.py:144
#, python-format
-msgid "Error installing '%s'"
+msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
-msgid ""
-"During the install a error occured. This is usually a bug in the packages, "
-"please report it. See the message below for more information. "
+#: ../DistUpgrade/DistUpgradeViewGtk.py:145
+msgid "The upgrade will abort. Please report the bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:224
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:225
+#: ../DistUpgrade/DistUpgradeViewGtk.py:217
msgid ""
"During the operation a fatal error occured. Please report this as a bug and "
"include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your "
"report. The upgrade will abort now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:305
+#: ../DistUpgrade/DistUpgradeViewGtk.py:293
#, python-format
msgid ""
"%s packages are going to be removed.\n"
@@ -516,37 +549,37 @@ msgid ""
"%s needs to be fetched"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:316
+#: ../DistUpgrade/DistUpgradeViewGtk.py:304
#, python-format
msgid "<b>To be removed: %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:318
+#: ../DistUpgrade/DistUpgradeViewGtk.py:306
#, python-format
msgid "To be installed: %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:308
#, python-format
msgid "To be upgraded: %s"
msgstr ""
#. print "on_window_main_delete_event()"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:351
+#: ../DistUpgrade/DistUpgradeViewGtk.py:339
msgid "Are you sure you want cancel?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:340
msgid ""
"Canceling during a upgrade can leave the system in a unstable state. It is "
"strongly adviced to continue the operation. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:67
msgid "Reboot required"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
"The upgrade is finished now. A reboot is required to now, do you want to do "
"this now?"
@@ -565,41 +598,55 @@ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:3
-msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgid "<b><big>Start the upgrade?</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:4
-msgid "Cleaning up"
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
+"span>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:5
-msgid "Details"
+msgid "Cleaning up"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:6
-msgid "Preparing upgrade"
+msgid "Details"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:7
-msgid "Terminal"
+msgid "Downloading and installing the upgrades"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:8
-msgid "Upgrading Ubuntu"
+msgid "Modifing the software channels"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:9
-msgid "Upgrading software channels"
+msgid "Preparing the upgrade"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Upgrading the system"
+msgid "Terminal"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
msgid "_Restart Now"
msgstr ""
+#, fuzzy
+#~ msgid "<b>Sources</b>"
+#~ msgstr "<b>Fontes de Software</b>"
+
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Componentes</b>"
diff --git a/po/ro.po b/po/ro.po
index f93944c9..bbe34c6a 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: \n"
-"POT-Creation-Date: 2006-01-26 15:51+0100\n"
+"POT-Creation-Date: 2006-02-08 21:14+0100\n"
"PO-Revision-Date: 2005-03-03 19:28+0200\n"
"Last-Translator: Dan Damian <dand@gnome.ro>\n"
"Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -18,18 +18,18 @@ msgstr ""
#: ../data/SoftwareProperties.glade.h:1
#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Actualizări de pe Internet</b>"
+msgid "<b>Channels</b>"
+msgstr "<b>Detalii</b>"
#: ../data/SoftwareProperties.glade.h:2
#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Detalii</b>"
+msgid "<b>Internet updates</b>"
+msgstr "<b>Actualizări de pe Internet</b>"
#: ../data/SoftwareProperties.glade.h:3
#, fuzzy
-msgid "<b>Sources</b>"
-msgstr "<b>Surse software</b>"
+msgid "<b>Keys</b>"
+msgstr "<b>Detalii</b>"
#: ../data/SoftwareProperties.glade.h:4
msgid "Add _Cdrom"
@@ -41,9 +41,8 @@ msgid "Authentication"
msgstr "A_utentificare"
#: ../data/SoftwareProperties.glade.h:6
-#, fuzzy
-msgid "Automatically check for updates"
-msgstr "Verifică a_utomat actualizările software."
+msgid "D_elete downloaded software files:"
+msgstr ""
#: ../data/SoftwareProperties.glade.h:7
#, fuzzy
@@ -56,35 +55,56 @@ msgstr ""
#: ../data/SoftwareProperties.glade.h:9
#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Actualizări de pe Internet</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+#, fuzzy
msgid "Restore _Defaults"
msgstr "Restaurează cheile implicite."
-#: ../data/SoftwareProperties.glade.h:10
+#: ../data/SoftwareProperties.glade.h:11
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/SoftwareProperties.glade.h:11
+#: ../data/SoftwareProperties.glade.h:12
msgid "Software Preferences"
msgstr "Preferinţe software"
-#: ../data/SoftwareProperties.glade.h:12
-msgid ""
-"daily\n"
-"every two days\n"
-"weekly\n"
-"every two weeks\n"
-"custom"
+#: ../data/SoftwareProperties.glade.h:13
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Install new updates without confirmation"
msgstr ""
#: ../data/UpdateManager.glade.h:1
-msgid "<big><b>Install software updates</b></big>"
+msgid ""
+"<b><big>You need to manually reload the latest information about updates</"
+"big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
msgstr ""
-#: ../data/UpdateManager.glade.h:2
-msgid "<big><b>Reading package information</b></big>"
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:3
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:8
msgid ""
"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
"\n"
@@ -94,57 +114,60 @@ msgstr ""
"\n"
"Trebuiesc obţinute schimbările de pe serverul central"
-#: ../data/UpdateManager.glade.h:6
-#, fuzzy
-msgid "Cancel downloading of the changelog"
-msgstr "Întrerupe descărcarea jurnalului de modificări"
+#: ../data/UpdateManager.glade.h:11
+msgid "Cancel _Download"
+msgstr ""
-#: ../data/UpdateManager.glade.h:7
+#: ../data/UpdateManager.glade.h:12
msgid "Changes"
msgstr "Modificări"
-#: ../data/UpdateManager.glade.h:8
+#: ../data/UpdateManager.glade.h:13
msgid "Description"
msgstr "Descriere"
-#: ../data/UpdateManager.glade.h:9
-msgid ""
-"Reading information about the installed packages. Depending on the speed of "
-"your computer this may take a bit."
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:14
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:15
+#, fuzzy
+msgid "Reload the latest information about updates"
+msgstr "Reîncarcă informaţiile despre pachete de pe server."
+
+#: ../data/UpdateManager.glade.h:16
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:17
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:18
msgid "Software Updates"
msgstr "Actualizări software"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:19
msgid ""
-"Software updates can fix possible security holes, fix possible errors, so "
-"called \"bugs\", or provide new features to you."
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "U_pgrade"
msgstr "Actualizare completă"
-#: ../data/UpdateManager.glade.h:16
-msgid "_Install"
+#: ../data/UpdateManager.glade.h:21
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:22
+#, fuzzy
+msgid "_Install Updates"
msgstr "_Instalează"
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:23
msgid "_Reload"
msgstr ""
@@ -156,13 +179,15 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Breezy 6.04 \"Dapper Drake\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgstr "Actualizări de securitate Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Breezy 5.10 \"Breezy Badger\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Actualizări de securitate Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:40
@@ -255,27 +280,37 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:237
-msgid "Choose a key-file"
+#: ../SoftwareProperties/SoftwareProperties.py:102
+#, python-format
+msgid "Every %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:132
+#, python-format
+msgid "After %s days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:247
+#: ../SoftwareProperties/SoftwareProperties.py:330
+msgid "Import key"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:340
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:248
+#: ../SoftwareProperties/SoftwareProperties.py:341
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:260
+#: ../SoftwareProperties/SoftwareProperties.py:353
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:261
+#: ../SoftwareProperties/SoftwareProperties.py:354
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:304
+#: ../SoftwareProperties/SoftwareProperties.py:397
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -283,72 +318,72 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:354
+#: ../SoftwareProperties/SoftwareProperties.py:447
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:463
msgid "Please insert a disc in the drive:"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:87
+#: ../DistUpgrade/DistUpgradeCache.py:92
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:88
+#: ../DistUpgrade/DistUpgradeCache.py:93
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:101
+#: ../DistUpgrade/DistUpgradeCache.py:135
msgid "Can't upgrade required meta-packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:103
+#: ../DistUpgrade/DistUpgradeCache.py:142
msgid "A essential package would have to be removed"
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:106
+#: ../DistUpgrade/DistUpgradeCache.py:145
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:107
+#: ../DistUpgrade/DistUpgradeCache.py:146
msgid ""
"A unresolvable problem occured while calculating the upgrade. Please report "
"this as a bug. "
msgstr ""
#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:129
+#: ../DistUpgrade/DistUpgradeCache.py:168
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:130
+#: ../DistUpgrade/DistUpgradeCache.py:169
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:232
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:194
+#: ../DistUpgrade/DistUpgradeCache.py:233
msgid ""
"It was impossible to install a required package. Please report this as a "
"bug. "
msgstr ""
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:201
+#: ../DistUpgrade/DistUpgradeCache.py:240
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:202
+#: ../DistUpgrade/DistUpgradeCache.py:241
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
"desktop package and it was not possible to detect which version of ubuntu "
@@ -362,79 +397,79 @@ msgid "Reading cache"
msgstr ""
#. FIXME: offer to write a new self.sources.list entry
-#: ../DistUpgrade/DistUpgradeControler.py:113
+#: ../DistUpgrade/DistUpgradeControler.py:107
msgid "No valid entry found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:114
+#: ../DistUpgrade/DistUpgradeControler.py:108
msgid ""
"While scaning your repository information no valid entry for the upgrade was "
"found.\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:129
+#: ../DistUpgrade/DistUpgradeControler.py:125
msgid "Repository information invalid"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:130
+#: ../DistUpgrade/DistUpgradeControler.py:126
msgid ""
"Upgrading the repository information resulted in a invalid file. Please "
"report this as a bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:166
+#: ../DistUpgrade/DistUpgradeControler.py:171
msgid "Error during update"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:172
msgid ""
"A problem occured during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:186
+#: ../DistUpgrade/DistUpgradeControler.py:190
msgid "Not enough free space"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:187
+#: ../DistUpgrade/DistUpgradeControler.py:191
msgid ""
"There is not enough free space on your system to download the required "
"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
"clean'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:192
+#: ../DistUpgrade/DistUpgradeControler.py:196
#, fuzzy
msgid "Perform Upgrade?"
msgstr "Actualizare completă"
#. installing the packages failed, can't be retried
-#: ../DistUpgrade/DistUpgradeControler.py:206
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:280
msgid "Error during commit"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:207
+#: ../DistUpgrade/DistUpgradeControler.py:212
msgid ""
"Some problem occured during the upgrade. Most likely packages failed to "
"install. Try 'sudo apt-get install -f' or synaptic to fix your system."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:223
+#: ../DistUpgrade/DistUpgradeControler.py:228
msgid "Error fetching the packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:224
+#: ../DistUpgrade/DistUpgradeControler.py:229
msgid ""
"Some problem occured during the fetching of the packages. This is most "
"likely a network problem. Please check your network and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:273
msgid "Remove obsolete Packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:264
+#: ../DistUpgrade/DistUpgradeControler.py:281
msgid ""
"Some problem occured during the clean-up. Please see the below message for "
"more information. "
@@ -442,50 +477,54 @@ msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:279
-#: ../DistUpgrade/DistUpgradeControler.py:298
-msgid "Checking update system"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:295
+#: ../DistUpgrade/DistUpgradeControler.py:318
+#, fuzzy
+msgid "Checking package manager"
+msgstr "Un alt manager de pachete rulează"
-#: ../DistUpgrade/DistUpgradeControler.py:290
+#: ../DistUpgrade/DistUpgradeControler.py:310
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:324
msgid "Asking for confirmation"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:308
+#: ../DistUpgrade/DistUpgradeControler.py:328
#, fuzzy
msgid "Upgrading"
msgstr "Actualizare completă"
-#: ../DistUpgrade/DistUpgradeControler.py:315
+#: ../DistUpgrade/DistUpgradeControler.py:335
msgid "Searching for obsolete software"
msgstr ""
-#. done, ask for reboot
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:340
msgid "System upgrade is complete."
msgstr ""
#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:70
+#: ../DistUpgrade/DistUpgradeViewGtk.py:76
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#: ../DistUpgrade/DistUpgradeViewGtk.py:94
+msgid "Download is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:105
#, python-format
msgid "Downloading file %li of %li with %s/s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:101
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
#, python-format
msgid "%s remaining"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:103
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
#, python-format
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
@@ -493,33 +532,31 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:126
-msgid "Installing updates ..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:131
+msgid "Installing updates"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:139
+#: ../DistUpgrade/DistUpgradeViewGtk.py:144
#, python-format
-msgid "Error installing '%s'"
+msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
-msgid ""
-"During the install a error occured. This is usually a bug in the packages, "
-"please report it. See the message below for more information. "
+#: ../DistUpgrade/DistUpgradeViewGtk.py:145
+msgid "The upgrade will abort. Please report the bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:224
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:225
+#: ../DistUpgrade/DistUpgradeViewGtk.py:217
msgid ""
"During the operation a fatal error occured. Please report this as a bug and "
"include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your "
"report. The upgrade will abort now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:305
+#: ../DistUpgrade/DistUpgradeViewGtk.py:293
#, python-format
msgid ""
"%s packages are going to be removed.\n"
@@ -529,37 +566,37 @@ msgid ""
"%s needs to be fetched"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:316
+#: ../DistUpgrade/DistUpgradeViewGtk.py:304
#, python-format
msgid "<b>To be removed: %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:318
+#: ../DistUpgrade/DistUpgradeViewGtk.py:306
#, python-format
msgid "To be installed: %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:308
#, python-format
msgid "To be upgraded: %s"
msgstr ""
#. print "on_window_main_delete_event()"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:351
+#: ../DistUpgrade/DistUpgradeViewGtk.py:339
msgid "Are you sure you want cancel?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:340
msgid ""
"Canceling during a upgrade can leave the system in a unstable state. It is "
"strongly adviced to continue the operation. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:67
msgid "Reboot required"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
"The upgrade is finished now. A reboot is required to now, do you want to do "
"this now?"
@@ -578,43 +615,65 @@ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:3
-msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgid "<b><big>Start the upgrade?</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:4
-msgid "Cleaning up"
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
+"span>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
#, fuzzy
msgid "Details"
msgstr "<b>Detalii</b>"
-#: ../DistUpgrade/DistUpgrade.glade.h:6
-msgid "Preparing upgrade"
-msgstr ""
-
#: ../DistUpgrade/DistUpgrade.glade.h:7
-msgid "Terminal"
+msgid "Downloading and installing the upgrades"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:8
-msgid "Upgrading Ubuntu"
+msgid "Modifing the software channels"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:9
-msgid "Upgrading software channels"
+msgid "Preparing the upgrade"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Upgrading the system"
+msgid "Terminal"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
msgid "_Restart Now"
msgstr ""
#, fuzzy
+#~ msgid "<b>Sources</b>"
+#~ msgstr "<b>Surse software</b>"
+
+#, fuzzy
+#~ msgid "Automatically check for updates"
+#~ msgstr "Verifică a_utomat actualizările software."
+
+#, fuzzy
+#~ msgid "Cancel downloading of the changelog"
+#~ msgstr "Întrerupe descărcarea jurnalului de modificări"
+
+#, fuzzy
#~ msgid "<b>Packages to install:</b>"
#~ msgstr "Pachete de instalat:"
@@ -763,9 +822,6 @@ msgstr ""
#~ msgid "The updates are being applied."
#~ msgstr "Actualizările sunt în curs de aplicare."
-#~ msgid "Another package manager is running"
-#~ msgstr "Un alt manager de pachete rulează"
-
#~ msgid ""
#~ "You can run only one package management application at the same time. "
#~ "Please close this other application first."
@@ -804,9 +860,6 @@ msgstr ""
#~ msgid "Software Properties"
#~ msgstr "Preferinţe software"
-#~ msgid "Reload the package information from the server."
-#~ msgstr "Reîncarcă informaţiile despre pachete de pe server."
-
#, fuzzy
#~ msgid "Binary"
#~ msgstr ""
diff --git a/po/rw.po b/po/rw.po
index 60b334f5..edb39589 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: \n"
-"POT-Creation-Date: 2006-01-26 15:51+0100\n"
+"POT-Creation-Date: 2006-02-08 21:14+0100\n"
"PO-Revision-Date: 2005-03-31 20:55-0700\n"
"Last-Translator: Steve Murphy <murf@e-tools.com>\n"
"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -26,17 +26,17 @@ msgstr ""
#: ../data/SoftwareProperties.glade.h:1
#, fuzzy
-msgid "<b>Internet updates</b>"
+msgid "<b>Channels</b>"
msgstr "<B B"
#: ../data/SoftwareProperties.glade.h:2
#, fuzzy
-msgid "<b>Keys</b>"
+msgid "<b>Internet updates</b>"
msgstr "<B B"
#: ../data/SoftwareProperties.glade.h:3
#, fuzzy
-msgid "<b>Sources</b>"
+msgid "<b>Keys</b>"
msgstr "<B B"
#: ../data/SoftwareProperties.glade.h:4
@@ -48,9 +48,8 @@ msgid "Authentication"
msgstr ""
#: ../data/SoftwareProperties.glade.h:6
-#, fuzzy
-msgid "Automatically check for updates"
-msgstr "Kugenzura... kugirango"
+msgid "D_elete downloaded software files:"
+msgstr ""
#: ../data/SoftwareProperties.glade.h:7
#, fuzzy
@@ -63,35 +62,56 @@ msgstr ""
#: ../data/SoftwareProperties.glade.h:9
#, fuzzy
+msgid "Internet Updates"
+msgstr "<B B"
+
+#: ../data/SoftwareProperties.glade.h:10
+#, fuzzy
msgid "Restore _Defaults"
msgstr "Mburabuzi Utubuto"
-#: ../data/SoftwareProperties.glade.h:10
+#: ../data/SoftwareProperties.glade.h:11
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/SoftwareProperties.glade.h:11
+#: ../data/SoftwareProperties.glade.h:12
msgid "Software Preferences"
msgstr ""
-#: ../data/SoftwareProperties.glade.h:12
-msgid ""
-"daily\n"
-"every two days\n"
-"weekly\n"
-"every two weeks\n"
-"custom"
+#: ../data/SoftwareProperties.glade.h:13
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Install new updates without confirmation"
msgstr ""
#: ../data/UpdateManager.glade.h:1
-msgid "<big><b>Install software updates</b></big>"
+msgid ""
+"<b><big>You need to manually reload the latest information about updates</"
+"big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:2
-msgid "<big><b>Reading package information</b></big>"
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
-#: ../data/UpdateManager.glade.h:3
+#: ../data/UpdateManager.glade.h:8
#, fuzzy
msgid ""
"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
@@ -101,13 +121,12 @@ msgstr ""
"<Uburemere UTSINDAGIYE Ingano Kinini Amahinduka Kuri Kubona i Amahinduka "
"Bivuye i Seriveri"
-#: ../data/UpdateManager.glade.h:6
-#, fuzzy
-msgid "Cancel downloading of the changelog"
-msgstr "Iyimura... i"
+#: ../data/UpdateManager.glade.h:11
+msgid "Cancel _Download"
+msgstr ""
# officecfg/registry\schema\org\openoffice\Office\Calc.xcs:....Revision.Color.Change.text
-#: ../data/UpdateManager.glade.h:7
+#: ../data/UpdateManager.glade.h:12
msgid "Changes"
msgstr "Amahinduka"
@@ -115,54 +134,57 @@ msgstr "Amahinduka"
# basctl/source\basicide\moptions.src:RID_MACROOPTIONS.RID_FT_DESCR.text
# #-#-#-#-# basctl.pot (PACKAGE VERSION) #-#-#-#-#
# basctl/source\basicide\moptions.src:RID_MACROOPTIONS.text
-#: ../data/UpdateManager.glade.h:8
+#: ../data/UpdateManager.glade.h:13
msgid "Description"
msgstr "Isobanuramiterere"
-#: ../data/UpdateManager.glade.h:9
-msgid ""
-"Reading information about the installed packages. Depending on the speed of "
-"your computer this may take a bit."
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:14
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:15
+#, fuzzy
+msgid "Reload the latest information about updates"
+msgstr "Kongerakuyitangiza i Ibisobanuro Bivuye i Seriveri"
+
+#: ../data/UpdateManager.glade.h:16
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:17
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:18
msgid "Software Updates"
msgstr "Ibihuzagihe bya porogaramumudasobwa "
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:19
msgid ""
-"Software updates can fix possible security holes, fix possible errors, so "
-"called \"bugs\", or provide new features to you."
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "U_pgrade"
msgstr "Byarangiye"
+#: ../data/UpdateManager.glade.h:21
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
# #-#-#-#-# setup2.pot (PACKAGE VERSION) #-#-#-#-#
# setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_PROG.text
# #-#-#-#-# setup2.pot (PACKAGE VERSION) #-#-#-#-#
# setup2/source\uibase\agentdlg.src:RC_AGENTDLG.RESID_DLG_AGENT_STR_INSTALL.text
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:22
#, fuzzy
-msgid "_Install"
+msgid "_Install Updates"
msgstr "Kwinjiza porogaramu"
# sfx2/sdi\sfxslots.src:SID_RELOAD.text
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:23
#, fuzzy
msgid "_Reload"
msgstr "Kongera Gutangiza"
@@ -175,13 +197,15 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Breezy 6.04 \"Dapper Drake\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgstr "5"
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Breezy 5.10 \"Breezy Badger\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "5"
#. Description
#: ../channels/Ubuntu.info.in:40
@@ -276,32 +300,41 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:237
-#, fuzzy
-msgid "Choose a key-file"
-msgstr "a Urufunguzo IDOSIYE"
+#: ../SoftwareProperties/SoftwareProperties.py:102
+#, python-format
+msgid "Every %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:132
+#, python-format
+msgid "After %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:330
+msgid "Import key"
+msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:247
+#: ../SoftwareProperties/SoftwareProperties.py:340
#, fuzzy
msgid "Error importing selected file"
msgstr "Kuzaza Byahiswemo IDOSIYE"
-#: ../SoftwareProperties/SoftwareProperties.py:248
+#: ../SoftwareProperties/SoftwareProperties.py:341
#, 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:260
+#: ../SoftwareProperties/SoftwareProperties.py:353
#, fuzzy
msgid "Error removing the key"
msgstr "i Urufunguzo"
-#: ../SoftwareProperties/SoftwareProperties.py:261
+#: ../SoftwareProperties/SoftwareProperties.py:354
#, 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:304
+#: ../SoftwareProperties/SoftwareProperties.py:397
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -309,38 +342,38 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:354
+#: ../SoftwareProperties/SoftwareProperties.py:447
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:463
msgid "Please insert a disc in the drive:"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:87
+#: ../DistUpgrade/DistUpgradeCache.py:92
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:88
+#: ../DistUpgrade/DistUpgradeCache.py:93
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:101
+#: ../DistUpgrade/DistUpgradeCache.py:135
msgid "Can't upgrade required meta-packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:103
+#: ../DistUpgrade/DistUpgradeCache.py:142
msgid "A essential package would have to be removed"
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:106
+#: ../DistUpgrade/DistUpgradeCache.py:145
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:107
+#: ../DistUpgrade/DistUpgradeCache.py:146
#, fuzzy
msgid ""
"A unresolvable problem occured while calculating the upgrade. Please report "
@@ -348,23 +381,23 @@ msgid ""
msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:129
+#: ../DistUpgrade/DistUpgradeCache.py:168
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:130
+#: ../DistUpgrade/DistUpgradeCache.py:169
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:232
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:194
+#: ../DistUpgrade/DistUpgradeCache.py:233
#, fuzzy
msgid ""
"It was impossible to install a required package. Please report this as a "
@@ -372,11 +405,11 @@ msgid ""
msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:201
+#: ../DistUpgrade/DistUpgradeCache.py:240
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:202
+#: ../DistUpgrade/DistUpgradeCache.py:241
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
"desktop package and it was not possible to detect which version of ubuntu "
@@ -390,81 +423,81 @@ msgid "Reading cache"
msgstr ""
#. FIXME: offer to write a new self.sources.list entry
-#: ../DistUpgrade/DistUpgradeControler.py:113
+#: ../DistUpgrade/DistUpgradeControler.py:107
msgid "No valid entry found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:114
+#: ../DistUpgrade/DistUpgradeControler.py:108
msgid ""
"While scaning your repository information no valid entry for the upgrade was "
"found.\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:129
+#: ../DistUpgrade/DistUpgradeControler.py:125
msgid "Repository information invalid"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:130
+#: ../DistUpgrade/DistUpgradeControler.py:126
msgid ""
"Upgrading the repository information resulted in a invalid file. Please "
"report this as a bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:166
+#: ../DistUpgrade/DistUpgradeControler.py:171
#, fuzzy
msgid "Error during update"
msgstr "i Urufunguzo"
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:172
msgid ""
"A problem occured during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:186
+#: ../DistUpgrade/DistUpgradeControler.py:190
msgid "Not enough free space"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:187
+#: ../DistUpgrade/DistUpgradeControler.py:191
msgid ""
"There is not enough free space on your system to download the required "
"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
"clean'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:192
+#: ../DistUpgrade/DistUpgradeControler.py:196
#, fuzzy
msgid "Perform Upgrade?"
msgstr "Byarangiye"
#. installing the packages failed, can't be retried
-#: ../DistUpgrade/DistUpgradeControler.py:206
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:280
msgid "Error during commit"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:207
+#: ../DistUpgrade/DistUpgradeControler.py:212
msgid ""
"Some problem occured during the upgrade. Most likely packages failed to "
"install. Try 'sudo apt-get install -f' or synaptic to fix your system."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:223
+#: ../DistUpgrade/DistUpgradeControler.py:228
#, fuzzy
msgid "Error fetching the packages"
msgstr "i Urufunguzo"
-#: ../DistUpgrade/DistUpgradeControler.py:224
+#: ../DistUpgrade/DistUpgradeControler.py:229
msgid ""
"Some problem occured during the fetching of the packages. This is most "
"likely a network problem. Please check your network and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:273
msgid "Remove obsolete Packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:264
+#: ../DistUpgrade/DistUpgradeControler.py:281
msgid ""
"Some problem occured during the clean-up. Please see the below message for "
"more information. "
@@ -472,50 +505,54 @@ msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:279
-#: ../DistUpgrade/DistUpgradeControler.py:298
-msgid "Checking update system"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:295
+#: ../DistUpgrade/DistUpgradeControler.py:318
+#, fuzzy
+msgid "Checking package manager"
+msgstr "Muyobozi ni"
-#: ../DistUpgrade/DistUpgradeControler.py:290
+#: ../DistUpgrade/DistUpgradeControler.py:310
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:324
msgid "Asking for confirmation"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:308
+#: ../DistUpgrade/DistUpgradeControler.py:328
#, fuzzy
msgid "Upgrading"
msgstr "Byarangiye"
-#: ../DistUpgrade/DistUpgradeControler.py:315
+#: ../DistUpgrade/DistUpgradeControler.py:335
msgid "Searching for obsolete software"
msgstr ""
-#. done, ask for reboot
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:340
msgid "System upgrade is complete."
msgstr ""
#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:70
+#: ../DistUpgrade/DistUpgradeViewGtk.py:76
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#: ../DistUpgrade/DistUpgradeViewGtk.py:94
+msgid "Download is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:105
#, python-format
msgid "Downloading file %li of %li with %s/s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:101
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
#, python-format
msgid "%s remaining"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:103
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
#, python-format
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
@@ -523,33 +560,31 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:126
-msgid "Installing updates ..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:131
+msgid "Installing updates"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:139
+#: ../DistUpgrade/DistUpgradeViewGtk.py:144
#, python-format
-msgid "Error installing '%s'"
+msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
-msgid ""
-"During the install a error occured. This is usually a bug in the packages, "
-"please report it. See the message below for more information. "
+#: ../DistUpgrade/DistUpgradeViewGtk.py:145
+msgid "The upgrade will abort. Please report the bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:224
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:225
+#: ../DistUpgrade/DistUpgradeViewGtk.py:217
msgid ""
"During the operation a fatal error occured. Please report this as a bug and "
"include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your "
"report. The upgrade will abort now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:305
+#: ../DistUpgrade/DistUpgradeViewGtk.py:293
#, python-format
msgid ""
"%s packages are going to be removed.\n"
@@ -559,37 +594,37 @@ msgid ""
"%s needs to be fetched"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:316
+#: ../DistUpgrade/DistUpgradeViewGtk.py:304
#, python-format
msgid "<b>To be removed: %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:318
+#: ../DistUpgrade/DistUpgradeViewGtk.py:306
#, python-format
msgid "To be installed: %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:308
#, python-format
msgid "To be upgraded: %s"
msgstr ""
#. print "on_window_main_delete_event()"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:351
+#: ../DistUpgrade/DistUpgradeViewGtk.py:339
msgid "Are you sure you want cancel?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:340
msgid ""
"Canceling during a upgrade can leave the system in a unstable state. It is "
"strongly adviced to continue the operation. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:67
msgid "Reboot required"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
"The upgrade is finished now. A reboot is required to now, do you want to do "
"this now?"
@@ -608,43 +643,69 @@ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:3
-msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgid "<b><big>Start the upgrade?</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:4
-msgid "Cleaning up"
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
+"span>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
#, fuzzy
msgid "Details"
msgstr "<B B"
-#: ../DistUpgrade/DistUpgrade.glade.h:6
-msgid "Preparing upgrade"
-msgstr ""
-
#: ../DistUpgrade/DistUpgrade.glade.h:7
-msgid "Terminal"
+msgid "Downloading and installing the upgrades"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:8
-msgid "Upgrading Ubuntu"
+msgid "Modifing the software channels"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:9
-msgid "Upgrading software channels"
+msgid "Preparing the upgrade"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Upgrading the system"
+msgid "Terminal"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
msgid "_Restart Now"
msgstr ""
#, fuzzy
+#~ msgid "<b>Sources</b>"
+#~ msgstr "<B B"
+
+#, fuzzy
+#~ msgid "Automatically check for updates"
+#~ msgstr "Kugenzura... kugirango"
+
+#, fuzzy
+#~ msgid "Cancel downloading of the changelog"
+#~ msgstr "Iyimura... i"
+
+#, fuzzy
+#~ msgid "Choose a key-file"
+#~ msgstr "a Urufunguzo IDOSIYE"
+
+#, fuzzy
#~ msgid "<b>Packages to install:</b>"
#~ msgstr "<B Kuri Kwinjiza porogaramu B"
@@ -828,10 +889,6 @@ msgstr ""
#~ msgstr "Byashyizweho"
#, fuzzy
-#~ msgid "Another package manager is running"
-#~ msgstr "Muyobozi ni"
-
-#, fuzzy
#~ msgid ""
#~ "You can run only one package management application at the same time. "
#~ "Please close this other application first."
@@ -900,10 +957,6 @@ msgstr ""
#~ msgid "Edit software sources and settings"
#~ msgstr "Na Amagenamiterere"
-#, fuzzy
-#~ msgid "Reload the package information from the server."
-#~ msgstr "Kongerakuyitangiza i Ibisobanuro Bivuye i Seriveri"
-
# #-#-#-#-# officecfg.pot (PACKAGE VERSION) #-#-#-#-#
# officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.Graphic.Export.PBM.FileFormat..0.text
# #-#-#-#-# officecfg.pot (PACKAGE VERSION) #-#-#-#-#
diff --git a/po/sv.po b/po/sv.po
index 768a47b4..25d34f61 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: \n"
-"POT-Creation-Date: 2006-01-26 15:51+0100\n"
+"POT-Creation-Date: 2006-02-08 21:14+0100\n"
"PO-Revision-Date: 2005-03-26 15:14+0100\n"
"Last-Translator: Christian Rose <menthos@menthos.com>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -18,18 +18,18 @@ msgstr ""
#: ../data/SoftwareProperties.glade.h:1
#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Internet-uppdateringar</b>"
+msgid "<b>Channels</b>"
+msgstr "Kanaler"
#: ../data/SoftwareProperties.glade.h:2
#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Detaljer</b>"
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet-uppdateringar</b>"
#: ../data/SoftwareProperties.glade.h:3
#, fuzzy
-msgid "<b>Sources</b>"
-msgstr "<b>Programvarukällor</b>"
+msgid "<b>Keys</b>"
+msgstr "<b>Detaljer</b>"
#: ../data/SoftwareProperties.glade.h:4
#, fuzzy
@@ -41,7 +41,7 @@ msgid "Authentication"
msgstr "Autentisering"
#: ../data/SoftwareProperties.glade.h:6
-msgid "Automatically check for updates"
+msgid "D_elete downloaded software files:"
msgstr ""
#: ../data/SoftwareProperties.glade.h:7
@@ -54,36 +54,56 @@ msgid "Installation Media"
msgstr "Installationer"
#: ../data/SoftwareProperties.glade.h:9
+msgid "Internet Updates"
+msgstr "Internet-uppdateringar"
+
+#: ../data/SoftwareProperties.glade.h:10
#, fuzzy
msgid "Restore _Defaults"
msgstr "Systemets standardalternativ"
-#: ../data/SoftwareProperties.glade.h:10
+#: ../data/SoftwareProperties.glade.h:11
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/SoftwareProperties.glade.h:11
+#: ../data/SoftwareProperties.glade.h:12
msgid "Software Preferences"
msgstr "Programvaruinställningar"
-#: ../data/SoftwareProperties.glade.h:12
-msgid ""
-"daily\n"
-"every two days\n"
-"weekly\n"
-"every two weeks\n"
-"custom"
+#: ../data/SoftwareProperties.glade.h:13
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Install new updates without confirmation"
msgstr ""
#: ../data/UpdateManager.glade.h:1
-msgid "<big><b>Install software updates</b></big>"
+msgid ""
+"<b><big>You need to manually reload the latest information about updates</"
+"big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
msgstr ""
-#: ../data/UpdateManager.glade.h:2
-msgid "<big><b>Reading package information</b></big>"
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:3
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:8
#, fuzzy
msgid ""
"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
@@ -94,58 +114,62 @@ msgstr ""
"Använd detta verktyg för att konfigurera det sätt som ditt system kommer åt "
"andra datorer"
-#: ../data/UpdateManager.glade.h:6
+#: ../data/UpdateManager.glade.h:11
#, fuzzy
-msgid "Cancel downloading of the changelog"
-msgstr "Avbryt hämtningen av changelog"
+msgid "Cancel _Download"
+msgstr "Hämta"
-#: ../data/UpdateManager.glade.h:7
+#: ../data/UpdateManager.glade.h:12
msgid "Changes"
msgstr "Ändringar"
-#: ../data/UpdateManager.glade.h:8
+#: ../data/UpdateManager.glade.h:13
msgid "Description"
msgstr "Beskrivning"
-#: ../data/UpdateManager.glade.h:9
-msgid ""
-"Reading information about the installed packages. Depending on the speed of "
-"your computer this may take a bit."
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:14
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:15
+#, fuzzy
+msgid "Reload the latest information about updates"
+msgstr "Läs om paketinformationen från servern."
+
+#: ../data/UpdateManager.glade.h:16
#, fuzzy
msgid "Show details"
msgstr "Detaljer"
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:17
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:18
msgid "Software Updates"
msgstr "Programvaruuppdateringar"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:19
msgid ""
-"Software updates can fix possible security holes, fix possible errors, so "
-"called \"bugs\", or provide new features to you."
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "U_pgrade"
msgstr "Uppgraderingar"
-#: ../data/UpdateManager.glade.h:16
-msgid "_Install"
-msgstr "_Installera"
+#: ../data/UpdateManager.glade.h:21
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:22
+#, fuzzy
+msgid "_Install Updates"
+msgstr "Letar efter uppdateringar..."
+
+#: ../data/UpdateManager.glade.h:23
#, fuzzy
msgid "_Reload"
msgstr "Läs om"
@@ -158,13 +182,14 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Breezy 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 \"Dapper Drake\""
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Breezy 5.10 \"Breezy Badger\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Brådskande uppdateringar"
#. Description
#: ../channels/Ubuntu.info.in:40
@@ -257,28 +282,38 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr "Tillgängliga program"
-#: ../SoftwareProperties/SoftwareProperties.py:237
+#: ../SoftwareProperties/SoftwareProperties.py:102
+#, python-format
+msgid "Every %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:132
+#, python-format
+msgid "After %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:330
#, fuzzy
-msgid "Choose a key-file"
-msgstr "Välj en spegel"
+msgid "Import key"
+msgstr "Viktighet"
-#: ../SoftwareProperties/SoftwareProperties.py:247
+#: ../SoftwareProperties/SoftwareProperties.py:340
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:248
+#: ../SoftwareProperties/SoftwareProperties.py:341
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:260
+#: ../SoftwareProperties/SoftwareProperties.py:353
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:261
+#: ../SoftwareProperties/SoftwareProperties.py:354
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:304
+#: ../SoftwareProperties/SoftwareProperties.py:397
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -286,73 +321,73 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:354
+#: ../SoftwareProperties/SoftwareProperties.py:447
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:463
msgid "Please insert a disc in the drive:"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:87
+#: ../DistUpgrade/DistUpgradeCache.py:92
#, fuzzy
msgid "Broken packages"
msgstr "paket"
-#: ../DistUpgrade/DistUpgradeCache.py:88
+#: ../DistUpgrade/DistUpgradeCache.py:93
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:101
+#: ../DistUpgrade/DistUpgradeCache.py:135
msgid "Can't upgrade required meta-packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:103
+#: ../DistUpgrade/DistUpgradeCache.py:142
msgid "A essential package would have to be removed"
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:106
+#: ../DistUpgrade/DistUpgradeCache.py:145
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:107
+#: ../DistUpgrade/DistUpgradeCache.py:146
msgid ""
"A unresolvable problem occured while calculating the upgrade. Please report "
"this as a bug. "
msgstr ""
#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:129
+#: ../DistUpgrade/DistUpgradeCache.py:168
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:130
+#: ../DistUpgrade/DistUpgradeCache.py:169
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:232
#, fuzzy, python-format
msgid "Can't install '%s'"
msgstr "inte installerad"
-#: ../DistUpgrade/DistUpgradeCache.py:194
+#: ../DistUpgrade/DistUpgradeCache.py:233
msgid ""
"It was impossible to install a required package. Please report this as a "
"bug. "
msgstr ""
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:201
+#: ../DistUpgrade/DistUpgradeCache.py:240
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:202
+#: ../DistUpgrade/DistUpgradeCache.py:241
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
"desktop package and it was not possible to detect which version of ubuntu "
@@ -366,81 +401,81 @@ msgid "Reading cache"
msgstr ""
#. FIXME: offer to write a new self.sources.list entry
-#: ../DistUpgrade/DistUpgradeControler.py:113
+#: ../DistUpgrade/DistUpgradeControler.py:107
msgid "No valid entry found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:114
+#: ../DistUpgrade/DistUpgradeControler.py:108
msgid ""
"While scaning your repository information no valid entry for the upgrade was "
"found.\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:129
+#: ../DistUpgrade/DistUpgradeControler.py:125
msgid "Repository information invalid"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:130
+#: ../DistUpgrade/DistUpgradeControler.py:126
msgid ""
"Upgrading the repository information resulted in a invalid file. Please "
"report this as a bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:166
+#: ../DistUpgrade/DistUpgradeControler.py:171
msgid "Error during update"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:172
msgid ""
"A problem occured during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:186
+#: ../DistUpgrade/DistUpgradeControler.py:190
msgid "Not enough free space"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:187
+#: ../DistUpgrade/DistUpgradeControler.py:191
msgid ""
"There is not enough free space on your system to download the required "
"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
"clean'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:192
+#: ../DistUpgrade/DistUpgradeControler.py:196
#, fuzzy
msgid "Perform Upgrade?"
msgstr "Uppgraderingar"
#. installing the packages failed, can't be retried
-#: ../DistUpgrade/DistUpgradeControler.py:206
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:280
msgid "Error during commit"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:207
+#: ../DistUpgrade/DistUpgradeControler.py:212
msgid ""
"Some problem occured during the upgrade. Most likely packages failed to "
"install. Try 'sudo apt-get install -f' or synaptic to fix your system."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:223
+#: ../DistUpgrade/DistUpgradeControler.py:228
#, fuzzy
msgid "Error fetching the packages"
msgstr "Inga matchande paket hittades"
-#: ../DistUpgrade/DistUpgradeControler.py:224
+#: ../DistUpgrade/DistUpgradeControler.py:229
msgid ""
"Some problem occured during the fetching of the packages. This is most "
"likely a network problem. Please check your network and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:273
#, fuzzy
msgid "Remove obsolete Packages?"
msgstr " Ta bort paket "
-#: ../DistUpgrade/DistUpgradeControler.py:264
+#: ../DistUpgrade/DistUpgradeControler.py:281
msgid ""
"Some problem occured during the clean-up. Please see the below message for "
"more information. "
@@ -448,50 +483,55 @@ msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:279
-#: ../DistUpgrade/DistUpgradeControler.py:298
-msgid "Checking update system"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:295
+#: ../DistUpgrade/DistUpgradeControler.py:318
+#, fuzzy
+msgid "Checking package manager"
+msgstr "En annan pakethanterare körs"
-#: ../DistUpgrade/DistUpgradeControler.py:290
+#: ../DistUpgrade/DistUpgradeControler.py:310
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:324
msgid "Asking for confirmation"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:308
+#: ../DistUpgrade/DistUpgradeControler.py:328
#, fuzzy
msgid "Upgrading"
msgstr "Uppgraderingar"
-#: ../DistUpgrade/DistUpgradeControler.py:315
+#: ../DistUpgrade/DistUpgradeControler.py:335
msgid "Searching for obsolete software"
msgstr ""
-#. done, ask for reboot
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:340
msgid "System upgrade is complete."
msgstr ""
#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:70
+#: ../DistUpgrade/DistUpgradeViewGtk.py:76
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#: ../DistUpgrade/DistUpgradeViewGtk.py:94
+#, fuzzy
+msgid "Download is complete"
+msgstr "Hämtning misslyckades"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:105
#, python-format
msgid "Downloading file %li of %li with %s/s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:101
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
#, python-format
msgid "%s remaining"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:103
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
#, python-format
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
@@ -499,34 +539,32 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:126
+#: ../DistUpgrade/DistUpgradeViewGtk.py:131
#, fuzzy
-msgid "Installing updates ..."
+msgid "Installing updates"
msgstr "Letar efter uppdateringar..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:139
-#, python-format
-msgid "Error installing '%s'"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:144
+#, fuzzy, python-format
+msgid "Could not install '%s'"
+msgstr "inte installerad"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
-msgid ""
-"During the install a error occured. This is usually a bug in the packages, "
-"please report it. See the message below for more information. "
+#: ../DistUpgrade/DistUpgradeViewGtk.py:145
+msgid "The upgrade will abort. Please report the bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:224
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:225
+#: ../DistUpgrade/DistUpgradeViewGtk.py:217
msgid ""
"During the operation a fatal error occured. Please report this as a bug and "
"include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your "
"report. The upgrade will abort now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:305
+#: ../DistUpgrade/DistUpgradeViewGtk.py:293
#, python-format
msgid ""
"%s packages are going to be removed.\n"
@@ -536,39 +574,39 @@ msgid ""
"%s needs to be fetched"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:316
+#: ../DistUpgrade/DistUpgradeViewGtk.py:304
#, python-format
msgid "<b>To be removed: %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:318
+#: ../DistUpgrade/DistUpgradeViewGtk.py:306
#, fuzzy, python-format
msgid "To be installed: %s"
msgstr "inte installerad"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:308
#, python-format
msgid "To be upgraded: %s"
msgstr ""
#. print "on_window_main_delete_event()"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:351
+#: ../DistUpgrade/DistUpgradeViewGtk.py:339
#, fuzzy
msgid "Are you sure you want cancel?"
msgstr "Är du säker på att du vill avsluta?"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:340
msgid ""
"Canceling during a upgrade can leave the system in a unstable state. It is "
"strongly adviced to continue the operation. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:67
#, fuzzy
msgid "Reboot required"
msgstr "Krav"
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
"The upgrade is finished now. A reboot is required to now, do you want to do "
"this now?"
@@ -587,43 +625,71 @@ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:3
-msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgid "<b><big>Start the upgrade?</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:4
-msgid "Cleaning up"
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
+"span>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:5
-msgid "Details"
-msgstr "Detaljer"
+msgid "Cleaning up"
+msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:6
-#, fuzzy
-msgid "Preparing upgrade"
-msgstr "Förbereder transaktion"
+msgid "Details"
+msgstr "Detaljer"
#: ../DistUpgrade/DistUpgrade.glade.h:7
-msgid "Terminal"
+msgid "Downloading and installing the upgrades"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:8
-msgid "Upgrading Ubuntu"
+msgid "Modifing the software channels"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:9
-msgid "Upgrading software channels"
-msgstr ""
+#, fuzzy
+msgid "Preparing the upgrade"
+msgstr "Förbereder transaktion"
#: ../DistUpgrade/DistUpgrade.glade.h:10
-#, fuzzy
-msgid "Upgrading the system"
-msgstr "Uppdaterar system"
+msgid "Terminal"
+msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
msgid "_Restart Now"
msgstr ""
+#, fuzzy
+#~ msgid "<b>Sources</b>"
+#~ msgstr "<b>Programvarukällor</b>"
+
+#, fuzzy
+#~ msgid "Cancel downloading of the changelog"
+#~ msgstr "Avbryt hämtningen av changelog"
+
+#~ msgid "_Install"
+#~ msgstr "_Installera"
+
+#, fuzzy
+#~ msgid "Choose a key-file"
+#~ msgstr "Välj en spegel"
+
+#, fuzzy
+#~ msgid "Upgrading the system"
+#~ msgstr "Uppdaterar system"
+
#~ msgid "<b>Details</b>"
#~ msgstr "<b>Detaljer</b>"
@@ -740,9 +806,6 @@ msgstr ""
#~ msgid "Upgrade finished"
#~ msgstr "Uppgradering slutförd"
-#~ msgid "Another package manager is running"
-#~ msgstr "En annan pakethanterare körs"
-
#~ msgid ""
#~ "You can run only one package management application at the same time. "
#~ "Please close this other application first."
@@ -800,9 +863,6 @@ msgstr ""
#~ msgid "Ubuntu Update Manager"
#~ msgstr "Ubuntu-uppdateringshanterare"
-#~ msgid "Reload the package information from the server."
-#~ msgstr "Läs om paketinformationen från servern."
-
#~ msgid "Binary"
#~ msgstr "Binär"
@@ -859,9 +919,6 @@ msgstr ""
#~ msgid "Distribution:"
#~ msgstr "Distribution:"
-#~ msgid "Internet Updates"
-#~ msgstr "Internet-uppdateringar"
-
#~ msgid "Type:"
#~ msgstr "Typ:"
@@ -980,9 +1037,6 @@ msgstr ""
#~ msgid "Perform installations and removals"
#~ msgstr "Utför installationer och borttagningar"
-#~ msgid "Channels"
-#~ msgstr "Kanaler"
-
#~ msgid "Change your channel subscriptions"
#~ msgstr "Ändra dina kanalprenumerationer"
@@ -1479,9 +1533,6 @@ msgstr ""
#~ msgid "Status"
#~ msgstr "Status"
-#~ msgid "Importance"
-#~ msgstr "Viktighet"
-
#~ msgid "Patches"
#~ msgstr "Programfixar"
@@ -1507,9 +1558,6 @@ msgstr ""
#~ msgid "Transaction Finished"
#~ msgstr "Transaktion slutförd"
-#~ msgid "Download Failed"
-#~ msgstr "Hämtning misslyckades"
-
#~ msgid "Unknown Error"
#~ msgstr "Okänt fel"
@@ -1992,9 +2040,6 @@ msgstr ""
#~ msgid "Pause"
#~ msgstr "Pausa"
-#~ msgid "Download"
-#~ msgstr "Hämta"
-
#~ msgid "OK"
#~ msgstr "OK"
diff --git a/po/xh.po b/po/xh.po
index d1759de3..80d24039 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: \n"
-"POT-Creation-Date: 2006-01-26 15:51+0100\n"
+"POT-Creation-Date: 2006-02-08 21:14+0100\n"
"PO-Revision-Date: 2005-03-30 13:25+0200\n"
"Last-Translator: Canonical Ltd <translations@canonical.com>\n"
"Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
@@ -18,17 +18,17 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n!=1;\n"
#: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Internet updates</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
#: ../data/SoftwareProperties.glade.h:2
-msgid "<b>Keys</b>"
+msgid "<b>Internet updates</b>"
msgstr ""
#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Sources</b>"
-msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
+msgid "<b>Keys</b>"
+msgstr ""
#: ../data/SoftwareProperties.glade.h:4
msgid "Add _Cdrom"
@@ -39,7 +39,7 @@ msgid "Authentication"
msgstr ""
#: ../data/SoftwareProperties.glade.h:6
-msgid "Automatically check for updates"
+msgid "D_elete downloaded software files:"
msgstr ""
#: ../data/SoftwareProperties.glade.h:7
@@ -52,92 +52,116 @@ msgid "Installation Media"
msgstr "Seka zonke izihlaziyo"
#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "Bonisa izihlaziyo"
+
+#: ../data/SoftwareProperties.glade.h:10
msgid "Restore _Defaults"
msgstr ""
-#: ../data/SoftwareProperties.glade.h:10
+#: ../data/SoftwareProperties.glade.h:11
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/SoftwareProperties.glade.h:11
+#: ../data/SoftwareProperties.glade.h:12
#, fuzzy
msgid "Software Preferences"
msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
-#: ../data/SoftwareProperties.glade.h:12
-msgid ""
-"daily\n"
-"every two days\n"
-"weekly\n"
-"every two weeks\n"
-"custom"
+#: ../data/SoftwareProperties.glade.h:13
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Install new updates without confirmation"
msgstr ""
#: ../data/UpdateManager.glade.h:1
-msgid "<big><b>Install software updates</b></big>"
+msgid ""
+"<b><big>You need to manually reload the latest information about updates</"
+"big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
msgstr ""
-#: ../data/UpdateManager.glade.h:2
-msgid "<big><b>Reading package information</b></big>"
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:3
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:8
msgid ""
"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
"\n"
"Need to get the changes from the central server"
msgstr ""
-#: ../data/UpdateManager.glade.h:6
-msgid "Cancel downloading of the changelog"
+#: ../data/UpdateManager.glade.h:11
+msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:7
+#: ../data/UpdateManager.glade.h:12
msgid "Changes"
msgstr ""
-#: ../data/UpdateManager.glade.h:8
+#: ../data/UpdateManager.glade.h:13
msgid "Description"
msgstr ""
-#: ../data/UpdateManager.glade.h:9
-msgid ""
-"Reading information about the installed packages. Depending on the speed of "
-"your computer this may take a bit."
+#: ../data/UpdateManager.glade.h:14
+msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:10
-msgid "Release Notes"
+#: ../data/UpdateManager.glade.h:15
+msgid "Reload the latest information about updates"
msgstr ""
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:16
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:17
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:18
#, fuzzy
msgid "Software Updates"
msgstr "Bonisa izihlaziyo"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:19
msgid ""
-"Software updates can fix possible security holes, fix possible errors, so "
-"called \"bugs\", or provide new features to you."
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:20
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:16
-msgid "_Install"
+#: ../data/UpdateManager.glade.h:21
+msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:22
+#, fuzzy
+msgid "_Install Updates"
+msgstr "Bonisa izihlaziyo"
+
+#: ../data/UpdateManager.glade.h:23
msgid "_Reload"
msgstr ""
@@ -149,12 +173,12 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Breezy 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 \"Dapper Drake\""
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Breezy 5.10 \"Breezy Badger\""
+msgid "Ubuntu 5.10 \"Breezy Badger\""
msgstr ""
#. Description
@@ -243,27 +267,37 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:237
-msgid "Choose a key-file"
+#: ../SoftwareProperties/SoftwareProperties.py:102
+#, python-format
+msgid "Every %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:132
+#, python-format
+msgid "After %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:330
+msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:247
+#: ../SoftwareProperties/SoftwareProperties.py:340
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:248
+#: ../SoftwareProperties/SoftwareProperties.py:341
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:260
+#: ../SoftwareProperties/SoftwareProperties.py:353
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:261
+#: ../SoftwareProperties/SoftwareProperties.py:354
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:304
+#: ../SoftwareProperties/SoftwareProperties.py:397
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -271,72 +305,72 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:354
+#: ../SoftwareProperties/SoftwareProperties.py:447
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:463
msgid "Please insert a disc in the drive:"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:87
+#: ../DistUpgrade/DistUpgradeCache.py:92
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:88
+#: ../DistUpgrade/DistUpgradeCache.py:93
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:101
+#: ../DistUpgrade/DistUpgradeCache.py:135
msgid "Can't upgrade required meta-packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:103
+#: ../DistUpgrade/DistUpgradeCache.py:142
msgid "A essential package would have to be removed"
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:106
+#: ../DistUpgrade/DistUpgradeCache.py:145
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:107
+#: ../DistUpgrade/DistUpgradeCache.py:146
msgid ""
"A unresolvable problem occured while calculating the upgrade. Please report "
"this as a bug. "
msgstr ""
#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:129
+#: ../DistUpgrade/DistUpgradeCache.py:168
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:130
+#: ../DistUpgrade/DistUpgradeCache.py:169
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:232
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:194
+#: ../DistUpgrade/DistUpgradeCache.py:233
msgid ""
"It was impossible to install a required package. Please report this as a "
"bug. "
msgstr ""
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:201
+#: ../DistUpgrade/DistUpgradeCache.py:240
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:202
+#: ../DistUpgrade/DistUpgradeCache.py:241
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
"desktop package and it was not possible to detect which version of ubuntu "
@@ -350,78 +384,78 @@ msgid "Reading cache"
msgstr ""
#. FIXME: offer to write a new self.sources.list entry
-#: ../DistUpgrade/DistUpgradeControler.py:113
+#: ../DistUpgrade/DistUpgradeControler.py:107
msgid "No valid entry found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:114
+#: ../DistUpgrade/DistUpgradeControler.py:108
msgid ""
"While scaning your repository information no valid entry for the upgrade was "
"found.\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:129
+#: ../DistUpgrade/DistUpgradeControler.py:125
msgid "Repository information invalid"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:130
+#: ../DistUpgrade/DistUpgradeControler.py:126
msgid ""
"Upgrading the repository information resulted in a invalid file. Please "
"report this as a bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:166
+#: ../DistUpgrade/DistUpgradeControler.py:171
msgid "Error during update"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:172
msgid ""
"A problem occured during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:186
+#: ../DistUpgrade/DistUpgradeControler.py:190
msgid "Not enough free space"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:187
+#: ../DistUpgrade/DistUpgradeControler.py:191
msgid ""
"There is not enough free space on your system to download the required "
"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
"clean'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:192
+#: ../DistUpgrade/DistUpgradeControler.py:196
msgid "Perform Upgrade?"
msgstr ""
#. installing the packages failed, can't be retried
-#: ../DistUpgrade/DistUpgradeControler.py:206
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:280
msgid "Error during commit"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:207
+#: ../DistUpgrade/DistUpgradeControler.py:212
msgid ""
"Some problem occured during the upgrade. Most likely packages failed to "
"install. Try 'sudo apt-get install -f' or synaptic to fix your system."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:223
+#: ../DistUpgrade/DistUpgradeControler.py:228
msgid "Error fetching the packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:224
+#: ../DistUpgrade/DistUpgradeControler.py:229
msgid ""
"Some problem occured during the fetching of the packages. This is most "
"likely a network problem. Please check your network and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:273
msgid "Remove obsolete Packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:264
+#: ../DistUpgrade/DistUpgradeControler.py:281
msgid ""
"Some problem occured during the clean-up. Please see the below message for "
"more information. "
@@ -429,49 +463,52 @@ msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:279
-#: ../DistUpgrade/DistUpgradeControler.py:298
-msgid "Checking update system"
+#: ../DistUpgrade/DistUpgradeControler.py:295
+#: ../DistUpgrade/DistUpgradeControler.py:318
+msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:290
+#: ../DistUpgrade/DistUpgradeControler.py:310
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:324
msgid "Asking for confirmation"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:308
+#: ../DistUpgrade/DistUpgradeControler.py:328
msgid "Upgrading"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:315
+#: ../DistUpgrade/DistUpgradeControler.py:335
msgid "Searching for obsolete software"
msgstr ""
-#. done, ask for reboot
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:340
msgid "System upgrade is complete."
msgstr ""
#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:70
+#: ../DistUpgrade/DistUpgradeViewGtk.py:76
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#: ../DistUpgrade/DistUpgradeViewGtk.py:94
+msgid "Download is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:105
#, python-format
msgid "Downloading file %li of %li with %s/s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:101
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
#, python-format
msgid "%s remaining"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:103
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
#, python-format
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
@@ -479,33 +516,32 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:126
-msgid "Installing updates ..."
-msgstr ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:131
+#, fuzzy
+msgid "Installing updates"
+msgstr "Seka zonke izihlaziyo"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:139
+#: ../DistUpgrade/DistUpgradeViewGtk.py:144
#, python-format
-msgid "Error installing '%s'"
+msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
-msgid ""
-"During the install a error occured. This is usually a bug in the packages, "
-"please report it. See the message below for more information. "
+#: ../DistUpgrade/DistUpgradeViewGtk.py:145
+msgid "The upgrade will abort. Please report the bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:224
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:225
+#: ../DistUpgrade/DistUpgradeViewGtk.py:217
msgid ""
"During the operation a fatal error occured. Please report this as a bug and "
"include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your "
"report. The upgrade will abort now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:305
+#: ../DistUpgrade/DistUpgradeViewGtk.py:293
#, python-format
msgid ""
"%s packages are going to be removed.\n"
@@ -515,37 +551,37 @@ msgid ""
"%s needs to be fetched"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:316
+#: ../DistUpgrade/DistUpgradeViewGtk.py:304
#, python-format
msgid "<b>To be removed: %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:318
+#: ../DistUpgrade/DistUpgradeViewGtk.py:306
#, python-format
msgid "To be installed: %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:308
#, python-format
msgid "To be upgraded: %s"
msgstr ""
#. print "on_window_main_delete_event()"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:351
+#: ../DistUpgrade/DistUpgradeViewGtk.py:339
msgid "Are you sure you want cancel?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:340
msgid ""
"Canceling during a upgrade can leave the system in a unstable state. It is "
"strongly adviced to continue the operation. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:67
msgid "Reboot required"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
"The upgrade is finished now. A reboot is required to now, do you want to do "
"this now?"
@@ -564,38 +600,48 @@ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:3
-msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgid "<b><big>Start the upgrade?</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:4
-msgid "Cleaning up"
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
+"span>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:5
-msgid "Details"
+msgid "Cleaning up"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:6
-msgid "Preparing upgrade"
+msgid "Details"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:7
-msgid "Terminal"
+msgid "Downloading and installing the upgrades"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:8
-msgid "Upgrading Ubuntu"
+msgid "Modifing the software channels"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:9
-msgid "Upgrading software channels"
+msgid "Preparing the upgrade"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Upgrading the system"
+msgid "Terminal"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
msgid "_Restart Now"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 68cbd74d..848034d7 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: \n"
-"POT-Creation-Date: 2006-01-26 15:51+0100\n"
+"POT-Creation-Date: 2006-02-08 21:14+0100\n"
"PO-Revision-Date: 2005-03-21 22:00+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -17,18 +17,18 @@ msgstr ""
#: ../data/SoftwareProperties.glade.h:1
#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Internet 更新</b>"
+msgid "<b>Channels</b>"
+msgstr "<b>细节</b>"
#: ../data/SoftwareProperties.glade.h:2
#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>细节</b>"
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet 更新</b>"
#: ../data/SoftwareProperties.glade.h:3
#, fuzzy
-msgid "<b>Sources</b>"
-msgstr "<b>软件源</b>"
+msgid "<b>Keys</b>"
+msgstr "<b>细节</b>"
#: ../data/SoftwareProperties.glade.h:4
#, fuzzy
@@ -41,9 +41,8 @@ msgid "Authentication"
msgstr "身份验证(_U)"
#: ../data/SoftwareProperties.glade.h:6
-#, fuzzy
-msgid "Automatically check for updates"
-msgstr "自动检查软件更新(_U)。"
+msgid "D_elete downloaded software files:"
+msgstr ""
#: ../data/SoftwareProperties.glade.h:7
#, fuzzy
@@ -56,92 +55,116 @@ msgstr ""
#: ../data/SoftwareProperties.glade.h:9
#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Internet 更新</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+#, fuzzy
msgid "Restore _Defaults"
msgstr "恢复默认密钥"
-#: ../data/SoftwareProperties.glade.h:10
+#: ../data/SoftwareProperties.glade.h:11
msgid "Restore the default keys of your distribution"
msgstr ""
-#: ../data/SoftwareProperties.glade.h:11
+#: ../data/SoftwareProperties.glade.h:12
msgid "Software Preferences"
msgstr "软件首选项"
-#: ../data/SoftwareProperties.glade.h:12
-msgid ""
-"daily\n"
-"every two days\n"
-"weekly\n"
-"every two weeks\n"
-"custom"
+#: ../data/SoftwareProperties.glade.h:13
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Install new updates without confirmation"
msgstr ""
#: ../data/UpdateManager.glade.h:1
-msgid "<big><b>Install software updates</b></big>"
+msgid ""
+"<b><big>You need to manually reload the latest information about updates</"
+"big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
msgstr ""
-#: ../data/UpdateManager.glade.h:2
-msgid "<big><b>Reading package information</b></big>"
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:3
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:8
msgid ""
"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
"\n"
"Need to get the changes from the central server"
msgstr ""
-#: ../data/UpdateManager.glade.h:6
-#, fuzzy
-msgid "Cancel downloading of the changelog"
-msgstr "取消更新日志的下载"
+#: ../data/UpdateManager.glade.h:11
+msgid "Cancel _Download"
+msgstr ""
-#: ../data/UpdateManager.glade.h:7
+#: ../data/UpdateManager.glade.h:12
msgid "Changes"
msgstr "更改"
-#: ../data/UpdateManager.glade.h:8
+#: ../data/UpdateManager.glade.h:13
msgid "Description"
msgstr "描述"
-#: ../data/UpdateManager.glade.h:9
-msgid ""
-"Reading information about the installed packages. Depending on the speed of "
-"your computer this may take a bit."
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:14
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:15
+#, fuzzy
+msgid "Reload the latest information about updates"
+msgstr "从服务器重新装入软件包信息。"
+
+#: ../data/UpdateManager.glade.h:16
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:17
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:18
msgid "Software Updates"
msgstr "软件更新"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:19
msgid ""
-"Software updates can fix possible security holes, fix possible errors, so "
-"called \"bugs\", or provide new features to you."
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "U_pgrade"
msgstr "更新已经完成"
-#: ../data/UpdateManager.glade.h:16
-msgid "_Install"
+#: ../data/UpdateManager.glade.h:21
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:22
+#, fuzzy
+msgid "_Install Updates"
msgstr "安装(_I)"
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:23
#, fuzzy
msgid "_Reload"
msgstr "重新装入"
@@ -154,13 +177,15 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Breezy 6.04 \"Dapper Drake\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgstr "Ubuntu 5.04 安全更新"
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Breezy 5.10 \"Breezy Badger\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Ubuntu 5.04 安全更新"
#. Description
#: ../channels/Ubuntu.info.in:40
@@ -253,27 +278,37 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:237
-msgid "Choose a key-file"
+#: ../SoftwareProperties/SoftwareProperties.py:102
+#, python-format
+msgid "Every %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:132
+#, python-format
+msgid "After %s days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:247
+#: ../SoftwareProperties/SoftwareProperties.py:330
+msgid "Import key"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:340
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:248
+#: ../SoftwareProperties/SoftwareProperties.py:341
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:260
+#: ../SoftwareProperties/SoftwareProperties.py:353
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:261
+#: ../SoftwareProperties/SoftwareProperties.py:354
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:304
+#: ../SoftwareProperties/SoftwareProperties.py:397
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -281,72 +316,72 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:354
+#: ../SoftwareProperties/SoftwareProperties.py:447
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:463
msgid "Please insert a disc in the drive:"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:87
+#: ../DistUpgrade/DistUpgradeCache.py:92
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:88
+#: ../DistUpgrade/DistUpgradeCache.py:93
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:101
+#: ../DistUpgrade/DistUpgradeCache.py:135
msgid "Can't upgrade required meta-packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:103
+#: ../DistUpgrade/DistUpgradeCache.py:142
msgid "A essential package would have to be removed"
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:106
+#: ../DistUpgrade/DistUpgradeCache.py:145
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:107
+#: ../DistUpgrade/DistUpgradeCache.py:146
msgid ""
"A unresolvable problem occured while calculating the upgrade. Please report "
"this as a bug. "
msgstr ""
#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:129
+#: ../DistUpgrade/DistUpgradeCache.py:168
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:130
+#: ../DistUpgrade/DistUpgradeCache.py:169
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:232
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:194
+#: ../DistUpgrade/DistUpgradeCache.py:233
msgid ""
"It was impossible to install a required package. Please report this as a "
"bug. "
msgstr ""
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:201
+#: ../DistUpgrade/DistUpgradeCache.py:240
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:202
+#: ../DistUpgrade/DistUpgradeCache.py:241
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
"desktop package and it was not possible to detect which version of ubuntu "
@@ -360,79 +395,79 @@ msgid "Reading cache"
msgstr ""
#. FIXME: offer to write a new self.sources.list entry
-#: ../DistUpgrade/DistUpgradeControler.py:113
+#: ../DistUpgrade/DistUpgradeControler.py:107
msgid "No valid entry found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:114
+#: ../DistUpgrade/DistUpgradeControler.py:108
msgid ""
"While scaning your repository information no valid entry for the upgrade was "
"found.\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:129
+#: ../DistUpgrade/DistUpgradeControler.py:125
msgid "Repository information invalid"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:130
+#: ../DistUpgrade/DistUpgradeControler.py:126
msgid ""
"Upgrading the repository information resulted in a invalid file. Please "
"report this as a bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:166
+#: ../DistUpgrade/DistUpgradeControler.py:171
msgid "Error during update"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:172
msgid ""
"A problem occured during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:186
+#: ../DistUpgrade/DistUpgradeControler.py:190
msgid "Not enough free space"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:187
+#: ../DistUpgrade/DistUpgradeControler.py:191
msgid ""
"There is not enough free space on your system to download the required "
"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
"clean'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:192
+#: ../DistUpgrade/DistUpgradeControler.py:196
#, fuzzy
msgid "Perform Upgrade?"
msgstr "更新已经完成"
#. installing the packages failed, can't be retried
-#: ../DistUpgrade/DistUpgradeControler.py:206
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:280
msgid "Error during commit"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:207
+#: ../DistUpgrade/DistUpgradeControler.py:212
msgid ""
"Some problem occured during the upgrade. Most likely packages failed to "
"install. Try 'sudo apt-get install -f' or synaptic to fix your system."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:223
+#: ../DistUpgrade/DistUpgradeControler.py:228
msgid "Error fetching the packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:224
+#: ../DistUpgrade/DistUpgradeControler.py:229
msgid ""
"Some problem occured during the fetching of the packages. This is most "
"likely a network problem. Please check your network and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:273
msgid "Remove obsolete Packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:264
+#: ../DistUpgrade/DistUpgradeControler.py:281
msgid ""
"Some problem occured during the clean-up. Please see the below message for "
"more information. "
@@ -440,50 +475,54 @@ msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:279
-#: ../DistUpgrade/DistUpgradeControler.py:298
-msgid "Checking update system"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:295
+#: ../DistUpgrade/DistUpgradeControler.py:318
+#, fuzzy
+msgid "Checking package manager"
+msgstr "正在运行另外一个软件包管理器"
-#: ../DistUpgrade/DistUpgradeControler.py:290
+#: ../DistUpgrade/DistUpgradeControler.py:310
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:324
msgid "Asking for confirmation"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:308
+#: ../DistUpgrade/DistUpgradeControler.py:328
#, fuzzy
msgid "Upgrading"
msgstr "更新已经完成"
-#: ../DistUpgrade/DistUpgradeControler.py:315
+#: ../DistUpgrade/DistUpgradeControler.py:335
msgid "Searching for obsolete software"
msgstr ""
-#. done, ask for reboot
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:340
msgid "System upgrade is complete."
msgstr ""
#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:70
+#: ../DistUpgrade/DistUpgradeViewGtk.py:76
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#: ../DistUpgrade/DistUpgradeViewGtk.py:94
+msgid "Download is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:105
#, python-format
msgid "Downloading file %li of %li with %s/s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:101
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
#, python-format
msgid "%s remaining"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:103
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
#, python-format
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
@@ -491,33 +530,31 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:126
-msgid "Installing updates ..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:131
+msgid "Installing updates"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:139
+#: ../DistUpgrade/DistUpgradeViewGtk.py:144
#, python-format
-msgid "Error installing '%s'"
+msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
-msgid ""
-"During the install a error occured. This is usually a bug in the packages, "
-"please report it. See the message below for more information. "
+#: ../DistUpgrade/DistUpgradeViewGtk.py:145
+msgid "The upgrade will abort. Please report the bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:224
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:225
+#: ../DistUpgrade/DistUpgradeViewGtk.py:217
msgid ""
"During the operation a fatal error occured. Please report this as a bug and "
"include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your "
"report. The upgrade will abort now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:305
+#: ../DistUpgrade/DistUpgradeViewGtk.py:293
#, python-format
msgid ""
"%s packages are going to be removed.\n"
@@ -527,37 +564,37 @@ msgid ""
"%s needs to be fetched"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:316
+#: ../DistUpgrade/DistUpgradeViewGtk.py:304
#, python-format
msgid "<b>To be removed: %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:318
+#: ../DistUpgrade/DistUpgradeViewGtk.py:306
#, python-format
msgid "To be installed: %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:308
#, python-format
msgid "To be upgraded: %s"
msgstr ""
#. print "on_window_main_delete_event()"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:351
+#: ../DistUpgrade/DistUpgradeViewGtk.py:339
msgid "Are you sure you want cancel?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:340
msgid ""
"Canceling during a upgrade can leave the system in a unstable state. It is "
"strongly adviced to continue the operation. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:67
msgid "Reboot required"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
"The upgrade is finished now. A reboot is required to now, do you want to do "
"this now?"
@@ -576,43 +613,65 @@ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:3
-msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgid "<b><big>Start the upgrade?</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:4
-msgid "Cleaning up"
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
+"span>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
#, fuzzy
msgid "Details"
msgstr "<b>细节</b>"
-#: ../DistUpgrade/DistUpgrade.glade.h:6
-msgid "Preparing upgrade"
-msgstr ""
-
#: ../DistUpgrade/DistUpgrade.glade.h:7
-msgid "Terminal"
+msgid "Downloading and installing the upgrades"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:8
-msgid "Upgrading Ubuntu"
+msgid "Modifing the software channels"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:9
-msgid "Upgrading software channels"
+msgid "Preparing the upgrade"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Upgrading the system"
+msgid "Terminal"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
msgid "_Restart Now"
msgstr ""
#, fuzzy
+#~ msgid "<b>Sources</b>"
+#~ msgstr "<b>软件源</b>"
+
+#, fuzzy
+#~ msgid "Automatically check for updates"
+#~ msgstr "自动检查软件更新(_U)。"
+
+#, fuzzy
+#~ msgid "Cancel downloading of the changelog"
+#~ msgstr "取消更新日志的下载"
+
+#, fuzzy
#~ msgid "<b>Packages to install:</b>"
#~ msgstr "要安装的软件包:"
@@ -707,9 +766,6 @@ msgstr ""
#~ msgid "The updates are being applied."
#~ msgstr "更新已经应用。"
-#~ msgid "Another package manager is running"
-#~ msgstr "正在运行另外一个软件包管理器"
-
#~ msgid "Your system is up-to-date!"
#~ msgstr "您的系统已为最新!"
@@ -744,9 +800,6 @@ msgstr ""
#~ msgid "Ubuntu Update Manager"
#~ msgstr "Ubuntu 更新管理器"
-#~ msgid "Reload the package information from the server."
-#~ msgstr "从服务器重新装入软件包信息。"
-
#, fuzzy
#~ msgid "Binary"
#~ msgstr ""