summaryrefslogtreecommitdiff
path: root/po/fi.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/fi.po')
-rw-r--r--po/fi.po600
1 files changed, 379 insertions, 221 deletions
diff --git a/po/fi.po b/po/fi.po
index e2fdf322..2c1b01ac 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-09-05 13:07+0200\n"
"PO-Revision-Date: 2006-05-25 18:26+0000\n"
"Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
"Language-Team: Finnish <ubuntu-fi@lists.ubuntu.com>\n"
@@ -66,7 +66,7 @@ msgstr ""
#. TRANSLATORS: %s is a country
#: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
#, python-format
msgid "Server for %s"
msgstr ""
@@ -75,54 +75,54 @@ msgstr ""
msgid "Nearest server"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
msgid "Custom servers"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:580
+#: ../SoftwareProperties/SoftwareProperties.py:597
msgid "Software Channel"
msgstr "Ohjelmistokanava"
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:588
+#: ../SoftwareProperties/SoftwareProperties.py:605
msgid "Active"
msgstr "Aktiivinen"
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:690
#, fuzzy
msgid "(Source Code)"
msgstr "Lähdekoodi"
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:696
#, fuzzy
msgid "Source Code"
msgstr "Lähdekoodi"
-#: ../SoftwareProperties/SoftwareProperties.py:908
+#: ../SoftwareProperties/SoftwareProperties.py:945
msgid "Import key"
msgstr "Tuo avain"
-#: ../SoftwareProperties/SoftwareProperties.py:918
+#: ../SoftwareProperties/SoftwareProperties.py:955
msgid "Error importing selected file"
msgstr "Virhe tuotaessa valittua avainta"
-#: ../SoftwareProperties/SoftwareProperties.py:919
+#: ../SoftwareProperties/SoftwareProperties.py:956
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"Valittu tiedosto ei ole kelvollinen GPG-avaintiedosto, tai se on "
"vahingoittunut."
-#: ../SoftwareProperties/SoftwareProperties.py:931
+#: ../SoftwareProperties/SoftwareProperties.py:968
msgid "Error removing the key"
msgstr "Virhe poistettaessa avainta"
-#: ../SoftwareProperties/SoftwareProperties.py:932
+#: ../SoftwareProperties/SoftwareProperties.py:969
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:978
+#: ../SoftwareProperties/SoftwareProperties.py:1015
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -133,19 +133,19 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:1035
+#: ../SoftwareProperties/SoftwareProperties.py:1072
msgid "Please enter a name for the disc"
msgstr "Syötä nimi levylle"
-#: ../SoftwareProperties/SoftwareProperties.py:1051
+#: ../SoftwareProperties/SoftwareProperties.py:1088
msgid "Please insert a disc in the drive:"
msgstr "Aseta levy asemaan:"
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:89
msgid "Broken packages"
msgstr "Rikkinäisiä paketteja"
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:90
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."
@@ -154,33 +154,36 @@ msgstr ""
"ohjelmalla. Korjaa ne käyttämällä synapticia tai apt-get-komentoa ennen "
"jatkamista."
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:147
msgid "Can't upgrade required meta-packages"
msgstr "Ei voida päivittää tarvittavia metapaketteja"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:154
msgid "A essential package would have to be removed"
msgstr "Välttämätön paketti jouduttaisiin poistamaan"
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:157
msgid "Could not calculate the upgrade"
msgstr "Ei voitu tehdä tarvittavia päivitykseen liittyviä tarkistuksia"
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:158
+#, fuzzy
msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
msgstr ""
"Tehtäessä päivitykseen liittyviä tarkistuksia tapahtui virhe jota ei voitu "
"korjata. Ilmoita tästä virheraportilla. "
#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:183
msgid "Error authenticating some packages"
msgstr "Joitain paketteja todennettaessa tapahtui virhe"
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:184
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 "
@@ -190,12 +193,12 @@ msgstr ""
"Voit yrittää myöhemmin uudelleen. Alla on luettelo todentamattomista "
"paketeista."
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:249
#, python-format
msgid "Can't install '%s'"
msgstr "Ei voitu asentaa pakettia \"%s\""
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:250
msgid ""
"It was impossible to install a required package. Please report this as a "
"bug. "
@@ -203,11 +206,11 @@ msgstr ""
"Pyydettyä pakettia ei voitu asentaa. Ole hyvä ja luo tästä virheraportti. "
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:257
msgid "Can't guess meta-package"
msgstr "Ei voitu arvata metapakettia"
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:258
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 "
@@ -221,15 +224,42 @@ msgstr ""
"Asenna jokin luetelluista paketeista synapticilla tai apt-get-ohjelmalla "
"ennen jatkamista."
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Ei voitu noutaa"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:104
msgid "Reading cache"
msgstr "Luetaan kätköä"
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:143
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:235
msgid "No valid mirror found"
msgstr "Ei löytynyt sopivaa palvelinta"
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:236
#, python-format
msgid ""
"While scaning your repository information no mirror entry for the upgrade "
@@ -250,11 +280,11 @@ msgstr ""
"Jos valitset \"Ei\", päivitys keskeytyy."
#. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:253
msgid "Generate default sources?"
msgstr "Luo ja ota käyttöön oletusohjelmalähteet?"
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:254
#, python-format
msgid ""
"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -267,11 +297,11 @@ msgstr ""
"Otetaanko käyttöön \"%s\":n oletuslähteet? Jos valitset \"Ei\", päivitys "
"keskeytyy."
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:288
msgid "Repository information invalid"
msgstr "Virhe ohjelmavarastotiedoissa"
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:289
msgid ""
"Upgrading the repository information resulted in a invalid file. Please "
"report this as a bug."
@@ -279,11 +309,11 @@ msgstr ""
"Ohjelmavarastotietojen päivittäminen johti epäkelpoon tiedostoon. Ilmoita "
"tästä virheraportilla."
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:295
msgid "Third party sources disabled"
msgstr "Kolmannen osapuolet ohjelmalähteet poissa käytöstä"
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:296
msgid ""
"Some third party entries in your souces.list were disabled. You can re-"
"enable them after the upgrade with the 'software-properties' tool or with "
@@ -293,11 +323,11 @@ msgstr ""
"käytöstä. Voit ottaa ne uudelleen käyttöön päivityksen jälkeen \"ohjelma-"
"asetukset\"-työkalulla tai Synaptic-ohjelmalla."
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:345
msgid "Error during update"
msgstr "Virhe päivitettäessä"
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:346
msgid ""
"A problem occured during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
@@ -305,11 +335,11 @@ msgstr ""
"Päivitettäessä tapahtui virhe. Tämä on yleensä jonkinlainen verkko-ongelma. "
"Tarkista verkkoyhteytesi toiminta ja yritä uudelleen."
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:355
msgid "Not enough free disk space"
msgstr "Levytilaa ei ole riittävästi"
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:356
#, python-format
msgid ""
"The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -321,27 +351,31 @@ msgstr ""
"komentoa 'sudo apt-get clean'."
#. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:415
msgid "Do you want to start the upgrade?"
msgstr "Haluatko aloittaaa päivityksen?"
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:432
msgid "Could not install the upgrades"
msgstr "Ei voitu asentaa päivityksiä"
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:433
+#, fuzzy
msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
msgstr ""
"Päivitys keskeytyy. Järjestelmäsi voi olla käyttökelvottomassa tilassa. "
"Korjaustoimenpiteet suoritettiin (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:451
msgid "Could not download the upgrades"
msgstr "Päivityksiä ei voitu noutaa"
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:452
msgid ""
"The upgrade aborts now. Please check your internet connection or "
"installation media and try again. "
@@ -349,11 +383,11 @@ msgstr ""
"Päivitys keskeytyy. Tarkista Internet-yhteytesi tai asennuslähteesi (esim. "
"CD) toiminta ja yritä uudelleen. "
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:488
msgid "Some software no longer officially supported"
msgstr "Jotkin ohjelmat eivät ole enää virallisesti tuettuja"
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:490
msgid ""
"These installed packages are no longer officially supported, and are now "
"only community-supported ('universe').\n"
@@ -367,23 +401,23 @@ msgstr ""
"Jos sinulla ei ole 'universe'-ohjelmakanavaa otettuna käyttöön, nämä paketit "
"suositellaan poistettaviksi seuraavassa kohdassa. "
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:524
msgid "Remove obsolete packages?"
msgstr "Poista vanhentuneet paketit?"
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:525
msgid "_Skip This Step"
msgstr "_Ohita tämä kohta"
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:525
msgid "_Remove"
msgstr "_Poista"
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:535
msgid "Error during commit"
msgstr "Virhe suoritettaesa"
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:536
msgid ""
"Some problem occured during the clean-up. Please see the below message for "
"more information. "
@@ -392,110 +426,101 @@ msgstr ""
"lisätietoja. "
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:546
msgid "Restoring original system state"
msgstr "Palautetaan alkuperäistä järjestelmän tilaa"
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:554
+#: ../DistUpgrade/DistUpgradeControler.py:583
msgid "Checking package manager"
msgstr "Tarkistetaan pakettienhallintaa"
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:569
msgid "Updating repository information"
msgstr "Päivitetään ohjelmavarastotietoja"
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:594
msgid "Invalid package information"
msgstr "Pakettitiedot viallisia"
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:595
+#, fuzzy, python-format
msgid ""
"After your package information was updated the essential package '%s' can "
"not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
msgstr ""
"Pakettitietojen päivitysten jälkeen pakollista ohjelmapakettia \"%s\" ei "
"enää löydetty.\n"
"Tämä merkitsee vakavaa virhettä, ilmoita tästä virheraportilla."
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:607
msgid "Asking for confirmation"
msgstr "Pyydetään vahvistusta"
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:611
msgid "Upgrading"
msgstr "Päivitetään"
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:618
msgid "Searching for obsolete software"
msgstr "Etsitään vanhetuneita ohjelmia"
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:623
msgid "System upgrade is complete."
msgstr "Järjestelmän päivitys on valmis."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Noin %li päivää, %li tuntia, %li minuuttia jäljellä"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Noin %li tuntia, %li minuuttia jäljellä"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Noin %li minuuttia jäljellä"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Noin %li sekuntia jäljellä"
-
#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr "Laita '%s' asemaan '%s'"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Lataus on valmis"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "Päivitys on valmis"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Noin %li minuuttia jäljellä"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
msgstr "Noudetaan tiedostoa %li/%li"
#. 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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
msgid "Applying changes"
msgstr "Toteutetaan muutoksia"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
#, python-format
msgid "Could not install '%s'"
msgstr "Ei voituu asentaa: '%s'"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "Päivitys keskeytyy. Ilmoita tästä virheraportilla."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
#, python-format
msgid ""
"Replace configuration file\n"
@@ -504,18 +529,20 @@ msgstr ""
"Korvataanko asetustiedosto\n"
"'%s'?"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
msgid "The 'diff' command was not found"
msgstr "Komentoa 'diff' ei löytynyt"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
msgid "A fatal error occured"
msgstr "Vakava virhe tapahtui"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#, fuzzy
msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
"Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
msgstr ""
"Ilmoita tästä virheraportilla ja sisällytä siihen tiedostot /var/log/dist-"
@@ -523,72 +550,106 @@ msgstr ""
#. FIXME: make those two seperate lines to make it clear
#. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:475
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] "%s paketti poistetaan"
msgstr[1] "%s pakettia poistetaan"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:480
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] "%s uusi paketti asennetaan"
msgstr[1] "%s uutta pakettia asennetaan"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:486
#, python-format
msgid "%s package is going to be upgraded."
msgid_plural "%s packages are going to be upgraded."
msgstr[0] "%s paketti päivitetään"
msgstr[1] "%s pakettia päivitetään"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
msgstr "Noudettavaa yhteensä %s."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#, fuzzy
msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
msgstr ""
"Päivitys voi kestää useita tunteja, eikä sitä voi keskeyttää enää myöhemmin."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:500
msgid "To prevent data loss close all open applications and documents."
msgstr ""
"Jottei tietoja häviäisi, sulje kaikki avoinna olevat ohjelmat ja dokumentit."
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:506
msgid "Could not find any upgrades"
msgstr "Päivityksiä ei löytynyt"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
msgid "Your system has already been upgraded."
msgstr "Järjestelmäsi on jo päivitetty."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:522
#, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Poista %s</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:524
#, python-format
msgid "Install %s"
msgstr "Asenna %s"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:526
#, python-format
msgid "Upgrade %s"
msgstr "Päivitä %s"
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Noin %li päivää, %li tuntia, %li minuuttia jäljellä"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Noin %li tuntia, %li minuuttia jäljellä"
+
+#: ../DistUpgrade/DistUpgradeView.py:31
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:32
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:38
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:105
msgid "Reboot required"
msgstr "Uudellenkäynnistys vaaditaan"
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:106
msgid ""
"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
@@ -645,7 +706,8 @@ msgid "Difference between the files"
msgstr "Tiedostojen väliset erot"
#: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
msgstr "Noudetaan ja asennetaan päivityksiä"
#: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -665,26 +727,22 @@ msgid "Terminal"
msgstr "Pääte"
#: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Päivitetään Ubuntua"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
msgid "_Keep"
msgstr "_Pidä"
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
msgid "_Replace"
msgstr "_Korvaa"
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
msgid "_Report Bug"
msgstr "_Tee virheraportti"
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
msgid "_Restart Now"
msgstr "_Uudelleenkäynnistä nyt"
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
msgid "_Resume Upgrade"
msgstr "_Jatka päivitystä"
@@ -705,47 +763,47 @@ msgid "Please check your internet connection."
msgstr "Tarkista Internet-yhteytesti toimivuus."
#. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
msgid "Could not run the upgrade tool"
msgstr "Ei voitu suorittaa päivitystyökalua"
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug"
msgstr ""
"Tämä on luultavasti ohjelmavirhe päivitystyökalussa. Ilmoita tästä "
"virheraportilla."
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
msgid "Downloading the upgrade tool"
msgstr "Ladataan päivitystyökalua"
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
msgid "The upgrade tool will guide you through the upgrade process."
msgstr "Päivitystyökalu ohjaa päivityksen suorittamisessa."
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
msgid "Upgrade tool signature"
msgstr "Päivitä työkalun allekirjoitus"
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
msgid "Upgrade tool"
msgstr "Päivitä työkalu"
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
msgid "Failed to fetch"
msgstr "Ei voitu noutaa"
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Päivityksen noutaminen epäonnistui. Tämä voi johtua verkko-ongelmasta. "
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
msgid "Failed to extract"
msgstr "Ei voitu purkaa"
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -753,11 +811,11 @@ msgstr ""
"Päivityksen purkaminen epäonnistui. Tämä voi johtua ongelmasta "
"verkkoyhteydessä tai palvelimessa. "
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
msgid "Verfication failed"
msgstr "Tarkistus epäonnistui"
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
msgid ""
"Verfing the upgrade failed. There may be a problem with the network or with "
"the server. "
@@ -765,11 +823,11 @@ msgstr ""
"Päivityksen tarkistaminen epäonnistui. Tämä voi johtua ongelmasta "
"verkkoyhteydessä tai palvelimessa. "
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
msgid "Authentication failed"
msgstr "Todennus epäonnistui"
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -787,85 +845,151 @@ msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s"
msgid "Downloading file %li of %li with unknown speed"
msgstr "Noudetaan tiedostoa %li/%li tuntemattomalla nopeudella"
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
#, fuzzy
msgid "The list of changes is not available"
msgstr "Muutosluettelo ei ole vielä saatavilla. Yritä myöhemmin uudelleen."
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
msgid "The list of changes is not available yet. Please try again later."
msgstr "Muutosluettelo ei ole vielä saatavilla. Yritä myöhemmin uudelleen."
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
"Muutosluettelon nouto epäonnistui. Tarkista Internet-yhteytesi toimivuus."
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 turvallisuuspäivitykset"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
#: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Päivitä Ubuntun viimeisimpään versioon"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Asennetaan päivityksiä"
+
+#: ../UpdateManager/UpdateManager.py:266
msgid "Cannot install all available updates"
msgstr "Ei voida asentaa kaikkia saatavilla olevia päivityksiä"
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
msgid ""
-"Some updates require the removal of further software. Use the function "
-"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
-"get dist-upgrade\" in a terminal to update your system completely."
+"Some of the updates require more extensive changesthan expected.\n"
+"\n"
+"This usually mean that your system is not fully upgraded or that you run a "
+"development release of the distribution.\n"
+"\n"
+"Would you like to perform a full distribution upgrade now?"
msgstr ""
-"Jotkut päivitykset vaativat muiden ohjelmien poistoa. Käytä \"Merkitse "
-"kaikki päivitykset\"-toimintoa Synaptic-pakettienhallintaojhelmassa, tai "
-"suorita päätteessä komento \"sudo apt-get dist-upgrade\"."
-
-#: ../UpdateManager/UpdateManager.py:235
-msgid "The following updates will be skipped:"
-msgstr "Seuraavat päivitykset ohitetaan:"
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:461
#, python-format
msgid "Version %s: \n"
msgstr "Versio: %s: \n"
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:522
msgid "Downloading the list of changes..."
msgstr "Noudetaan muutosluetteloa..."
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:546
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:551
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:591
+#, fuzzy
+msgid "None"
+msgstr "Ei-vapaa"
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:594
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:597
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:600
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:608 ../UpdateManager/UpdateManager.py:618
+#: ../UpdateManager/UpdateManager.py:642
#, python-format
msgid "Download size: %s"
msgstr "%s täytyy noutaa"
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:627
msgid "Your system is up-to-date"
msgstr "Järjestelmäsi on ajan tasalla"
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:638
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] "Voit asentaa %s päivityksen"
msgstr[1] "Voit asentaa %s päivitystä"
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:671
msgid "Please wait, this can take some time."
msgstr "Odota, tämä voi kestää jonkun aikaa."
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:673
msgid "Update is complete"
msgstr "Päivitys on valmis"
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:822
+#, fuzzy, python-format
+msgid "From version %s to %s"
msgstr "Uusi versio: %s (koko: %s)"
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:826
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Versio: %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:828
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:842
msgid "Your distribution is not supported anymore"
msgstr "Jakeluasi ei enää tueta"
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:843
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -875,17 +999,17 @@ msgstr ""
"Päivitä uudempaan versioon Ubuntu Linuxista. Katso lisätietoja "
"päivittämisestä osoitteesta http://www.ubuntu.com/"
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:862
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr "<b>Uusi jakelujulkaisu \"%s\" on saatavilla</b>"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:897
msgid "Software index is broken"
msgstr "Ohjelmaluettelo on rikkinäinen"
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:898
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1006,11 +1130,12 @@ msgid "<b>CDROM/DVD</b>"
msgstr ""
#: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet-päivitykset</b>"
#: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
msgstr "<b>Internet-päivitykset</b>"
#: ../data/glade/SoftwareProperties.glade.h:6
@@ -1257,177 +1382,189 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
#, fuzzy
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
msgid ""
"OpenSource software that is officially supported by Canonical Ltd. (main)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
#, fuzzy
msgid "Community maintained (universe)"
msgstr "Yhteisön ylläpitämät (universe)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
msgid "OpenSource software that is maintained by the community (universe)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
#, fuzzy
msgid "Non-free drivers"
msgstr "Ei-vapaat ohjelmat (multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
msgid "Proprietary drivers for devices (restricted) "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
#, fuzzy
msgid "Restricted software (Multiverse)"
msgstr "Ei-vapaat ohjelmat (multiverse)"
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
msgid "Software that is restricted by copyright or legal issues (multiverse)"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
#, fuzzy
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr "Ubuntu 6.06 'Dapper Drake'"
#. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
#, fuzzy
msgid "Important security updates"
msgstr "Ubuntu 5.10 turvallisuuspäivitykset"
#. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
msgid "Recommended updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Asennetaan päivityksiä"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
msgid "Officially supported"
msgstr "Virallisesti tuettu"
#. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
#, fuzzy
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.10 turvallisuuspäivitykset"
#. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.10 päivitykset"
#. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
msgid "Ubuntu 5.10 Backports"
msgstr "Ubuntu 5.10 takaisinsovitukset"
#. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
#, fuzzy
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
#. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
#, fuzzy
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:203
+msgid "Oficially supported"
+msgstr "Virallisesti tuettu"
+
#. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
#, fuzzy
msgid "Ubuntu 5.04 Security Updates"
msgstr "Ubuntu 5.10 turvallisuuspäivitykset"
#. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
#, fuzzy
msgid "Ubuntu 5.04 Updates"
msgstr "Ubuntu 5.10 päivitykset"
#. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
#, fuzzy
msgid "Ubuntu 5.04 Backports"
msgstr "Ubuntu 5.10 takaisinsovitukset"
#. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
#, fuzzy
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr "Ubuntu 5.10 'Breezy Badger'"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
msgid "Community maintained (Universe)"
msgstr "Yhteisön ylläpitämät (universe)"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
msgid "Non-free (Multiverse)"
msgstr "Ei-vapaat ohjelmat (multiverse)"
#. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
-msgid "Oficially supported"
-msgstr "Virallisesti tuettu"
+#: ../data/channels/Ubuntu.info.in:254
+#, fuzzy
+msgid "No longer oficially supported"
+msgstr "Jotkin ohjelmat eivät ole enää virallisesti tuettuja"
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
msgid "Restricted copyright"
msgstr "Rajoitettu tekijänoikeus"
#. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
msgid "Ubuntu 4.10 Security Updates"
msgstr "Ubuntu 4.10 turvallisuuspäivitykset"
#. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
#, fuzzy
msgid "Ubuntu 4.10 Updates"
msgstr "Ubuntu 5.10 päivitykset"
#. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
#, fuzzy
msgid "Ubuntu 4.10 Backports"
msgstr "Ubuntu 5.10 takaisinsovitukset"
@@ -1479,6 +1616,30 @@ msgstr ""
msgid "Non-DFSG-compatible Software"
msgstr "DFSG-epäyhteensopivat ohjelmat"
+#~ msgid ""
+#~ "Some updates require the removal of further software. Use the function "
+#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
+#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
+#~ msgstr ""
+#~ "Jotkut päivitykset vaativat muiden ohjelmien poistoa. Käytä \"Merkitse "
+#~ "kaikki päivitykset\"-toimintoa Synaptic-pakettienhallintaojhelmassa, tai "
+#~ "suorita päätteessä komento \"sudo apt-get dist-upgrade\"."
+
+#~ msgid "The following updates will be skipped:"
+#~ msgstr "Seuraavat päivitykset ohitetaan:"
+
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Noin %li sekuntia jäljellä"
+
+#~ msgid "Download is complete"
+#~ msgstr "Lataus on valmis"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "Päivitys keskeytyy. Ilmoita tästä virheraportilla."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Päivitetään Ubuntua"
+
#~ msgid "Hide details"
#~ msgstr "Piilota yksityiskohdat"
@@ -1900,6 +2061,3 @@ msgstr "DFSG-epäyhteensopivat ohjelmat"
#~ msgid "0"
#~ msgstr "0"
-
-#~ msgid "Non-free"
-#~ msgstr "Ei-vapaa"