From f6444644dc9601b4cbfdf2b621c77741a367b778 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 30 Mar 2006 16:11:04 +0200 Subject: * DumbTerminal.run() -> DumbTerminal.call() --- DistUpgrade/DistUpgradeView.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py index 02894939..14ac5208 100644 --- a/DistUpgrade/DistUpgradeView.py +++ b/DistUpgrade/DistUpgradeView.py @@ -20,7 +20,7 @@ # USA class DumbTerminal(object): - def run(self, cmd): + def call(self, cmd): " expects a command in the subprocess style (as a list) " subprocess.call(cmd) -- cgit v1.2.3 From 61988fdcff46cb139d2258d75fa06d522b2842cc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 3 Apr 2006 10:34:46 +0200 Subject: * use the shiped aptsources.py instead of the systems one --- DistUpgrade/DistUpgradeControler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 6ee2fb97..0277969d 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -30,7 +30,7 @@ import re import statvfs from DistUpgradeConfigParser import DistUpgradeConfig -from SoftwareProperties.aptsources import SourcesList, SourceEntry +from aptsources import SourcesList, SourceEntry from gettext import gettext as _ from DistUpgradeCache import MyCache -- cgit v1.2.3 From c6c1a17f269ed651e4165cd2277a2947ee6e1883 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 3 Apr 2006 11:13:17 +0200 Subject: * DistUpgrade/build-tarball.sh: fixed clean target * po/*: latest rosetta translations merged --- DistUpgrade/build-tarball.sh | 2 +- po/da.po | 64 ++-- po/fr.po | 10 +- po/no.po | 115 +++--- po/update-manager.pot | 858 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 967 insertions(+), 82 deletions(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/build-tarball.sh b/DistUpgrade/build-tarball.sh index 9f01b87c..a30e40a0 100755 --- a/DistUpgrade/build-tarball.sh +++ b/DistUpgrade/build-tarball.sh @@ -3,7 +3,7 @@ DIST=dapper # cleanup -rm -f *~ *.bak *.pyc +rm -f *~ *.bak *.pyc *.moved '#'* # update po (cd ../po; make update-po) diff --git a/po/da.po b/po/da.po index 2c06b172..757781ac 100644 --- a/po/da.po +++ b/po/da.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2006-03-22 23:28+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2006-03-31 07:38+0000\n" +"Last-Translator: Lennart Hansen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,35 +18,38 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1\n" #: ../SoftwareProperties/SoftwareProperties.py:104 -#, python-format +#, fuzzy msgid "Every %s days" -msgstr "" +msgstr "Hver %s. dag" #: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" -msgstr "" +msgstr "Efter %s dag(e)" #: ../SoftwareProperties/SoftwareProperties.py:382 msgid "Import key" -msgstr "" +msgstr "Importer nøgle" #: ../SoftwareProperties/SoftwareProperties.py:392 msgid "Error importing selected file" -msgstr "" +msgstr "Fejl under importering af den valgte fil" #: ../SoftwareProperties/SoftwareProperties.py:393 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" +"Den valgte fil lader ikke til at være en GPG nøgle fil eller er korrupt" #: ../SoftwareProperties/SoftwareProperties.py:405 msgid "Error removing the key" -msgstr "" +msgstr "Fejl ved fjernelse af nøgle" #: ../SoftwareProperties/SoftwareProperties.py:406 msgid "" "The key you selected could not be removed. Please report this as a bug." msgstr "" +"Den valgte nøgle kunne ikke fjernes. Rapporter venligst denne fejl som en " +"bug." #: ../SoftwareProperties/SoftwareProperties.py:447 #, python-format @@ -55,68 +58,86 @@ msgid "" "\n" "%s" msgstr "" +"Fejl ved scanning af CD\n" +"\n" +"%s" #: ../SoftwareProperties/SoftwareProperties.py:504 msgid "Please enter a name for the disc" -msgstr "" +msgstr "Indtast venligst et navn for disken" #: ../SoftwareProperties/SoftwareProperties.py:520 msgid "Please insert a disc in the drive:" -msgstr "" +msgstr "Indtast venligst en disk i drevet:" #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" -msgstr "" +msgstr "Ødelagt Pakke" #: ../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 "" +"Dit system indeholder ødelagte pakker som ikke kan repareres med dette " +"program. Reparer dem først med synaptic eller apt-get før du fortsætter." #: ../DistUpgrade/DistUpgradeCache.py:135 msgid "Can't upgrade required meta-packages" -msgstr "" +msgstr "Kan ikke opgradere krævet meta-pakke" #: ../DistUpgrade/DistUpgradeCache.py:142 msgid "A essential package would have to be removed" -msgstr "" +msgstr "En system kritisk pakke ville have blevet fjernet" #: ../DistUpgrade/DistUpgradeCache.py:145 +#, fuzzy msgid "Could not calculate the upgrade" -msgstr "" +msgstr "Kunne ikke beregne upgraderings tiden" #: ../DistUpgrade/DistUpgradeCache.py:146 +#, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "" +"Der er forkommet et uløseligt problem imens beregning af upgraderings tid. " +"Raporter venligst denne fejl. " #: ../DistUpgrade/DistUpgradeCache.py:168 +#, fuzzy msgid "Error authenticating some packages" -msgstr "" +msgstr "Fejl ved validering af nogle pakker" #: ../DistUpgrade/DistUpgradeCache.py:169 +#, fuzzy 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 "" +"Det var ikke muligt at validere nogle af pakkerne. Dette kan være pga. " +"Netværks problemer. Det anbefales du prøver igen senere. Se længere nede for " +"en liste over pakker som ikke kunne valideres." #: ../DistUpgrade/DistUpgradeCache.py:232 #, python-format msgid "Can't install '%s'" -msgstr "" +msgstr "Kan ikke installere '%s'" #: ../DistUpgrade/DistUpgradeCache.py:233 +#, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" +"Det var umuligt at installere en pakke som var krævet. Venligst raporter " +"denne hændelse som en fejl. " #: ../DistUpgrade/DistUpgradeCache.py:240 +#, fuzzy msgid "Can't guess meta-package" -msgstr "" +msgstr "Kan ikke gætte meta-pakke" #: ../DistUpgrade/DistUpgradeCache.py:241 msgid "" @@ -163,7 +184,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:191 msgid "Not enough free disk space" -msgstr "" +msgstr "Ikke nok frit disk plads" #: ../DistUpgrade/DistUpgradeControler.py:192 #, python-format @@ -175,11 +196,12 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:198 msgid "Do you want to start the upgrade?" -msgstr "" +msgstr "Vil du starte opgraderingen?" #: ../DistUpgrade/DistUpgradeControler.py:214 +#, fuzzy msgid "Could not install the upgrades" -msgstr "" +msgstr "Kan ikke installere opgraderingerne" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" @@ -189,7 +211,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 msgid "Could not download the upgrades" -msgstr "" +msgstr "Kan ikke hente opgraderingerne" #: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" diff --git a/po/fr.po b/po/fr.po index fd60edbc..cc73d029 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: update-manager 0.37.2\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" "POT-Creation-Date: 2006-03-22 23:28+0000\n" -"PO-Revision-Date: 2006-03-29 05:45+0000\n" +"PO-Revision-Date: 2006-04-02 06:12+0000\n" "Last-Translator: Alexandre Patenaude \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -115,8 +115,8 @@ msgid "" "unauthenticated packages." msgstr "" "Il a été impossible d'authentifier certains paquets. Cela peut provenir d'un " -"problème de transmission du réseau. Vous voudrez sans doute réessayer plus " -"tard. Vous trouverez ci-dessous une liste des paquets non authentifiés." +"problème temporaire du réseau. Vous voudrez sans doute réessayer plus tard. " +"Vous trouverez ci-dessous une liste des paquets non authentifiés." #: ../DistUpgrade/DistUpgradeCache.py:232 #, python-format @@ -133,7 +133,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeCache.py:240 msgid "Can't guess meta-package" -msgstr "Impossible de déterminer le meta-paquet" +msgstr "Impossible de déterminer le méta-paquet" #: ../DistUpgrade/DistUpgradeCache.py:241 msgid "" @@ -174,7 +174,7 @@ msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -"La mise à jour des informations de le dépôt a créé un fichier invalide. " +"La mise à jour des informations du dépôt a créé un fichier invalide. " "Veuillez rapporter ceci en tant que bogue." #: ../DistUpgrade/DistUpgradeControler.py:171 diff --git a/po/no.po b/po/no.po index f866b068..f9028ac3 100644 --- a/po/no.po +++ b/po/no.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-27 16:38+0200\n" +"POT-Creation-Date: 2006-04-03 11:03+0200\n" "PO-Revision-Date: 2005-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola \n" "Language-Team: Norwegian Bokmal \n" @@ -17,38 +17,38 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.10\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:407 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:417 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Feil under importering av fil" -#: ../SoftwareProperties/SoftwareProperties.py:418 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Den valgte filen er ikke en GPG-fil eller så er den skadet." -#: ../SoftwareProperties/SoftwareProperties.py:430 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Feil under fjerning av nøkkel" -#: ../SoftwareProperties/SoftwareProperties.py:431 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." -#: ../SoftwareProperties/SoftwareProperties.py:472 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "Error scaning the CD\n" @@ -56,11 +56,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:529 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:545 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "" @@ -139,42 +139,42 @@ msgid "Reading cache" msgstr "" #. FIXME: offer to write a new self.sources.list entry -#: ../DistUpgrade/DistUpgradeControler.py:107 +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 #, fuzzy msgid "Error during update" msgstr "Feil under fjerning av nøkkel" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 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:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -182,48 +182,48 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:214 +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "is now run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:230 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:232 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:274 +#: ../DistUpgrade/DistUpgradeControler.py:273 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:275 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:275 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:285 +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:286 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -231,31 +231,31 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:300 -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 #, fuzzy msgid "Checking package manager" msgstr "En annen pakkehåndterer kjører" -#: ../DistUpgrade/DistUpgradeControler.py:316 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:330 +#: ../DistUpgrade/DistUpgradeControler.py:331 #, fuzzy msgid "Asking for confirmation" msgstr "Undersøker systemkonfigurasjon" -#: ../DistUpgrade/DistUpgradeControler.py:334 +#: ../DistUpgrade/DistUpgradeControler.py:335 #, fuzzy msgid "Upgrading" msgstr "Oppgradering fullført" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "" @@ -275,108 +275,113 @@ msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, python-format -msgid "Downloading file %li of %li at unknown speed" +msgid "Downloading file %li of %li" 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:136 +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 #, fuzzy msgid "Applying changes" msgstr "Laster ned endringer..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:150 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." #. self.expander.set_expanded(True) -#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 #, python-format msgid "" "Replace configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:262 +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:263 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:352 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:364 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:375 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:378 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:384 +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:385 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 #, fuzzy msgid "Your system has already been upgraded." msgstr "Systemet har ødelagte pakker!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:400 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, fuzzy, python-format msgid "Remove %s" msgstr "Detaljer" -#: ../DistUpgrade/DistUpgradeViewGtk.py:402 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, fuzzy, python-format msgid "Install %s" msgstr "_Installer" -#: ../DistUpgrade/DistUpgradeViewGtk.py:404 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Oppgradering fullført" @@ -417,7 +422,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"Upgrading to Ubuntu \"Dapper\" 6.04Upgrading to Ubuntu \"Dapper\" 6.06" msgstr "" diff --git a/po/update-manager.pot b/po/update-manager.pot index e69de29b..838cf650 100644 --- a/po/update-manager.pot +++ b/po/update-manager.pot @@ -0,0 +1,858 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-04-03 11:03+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" + +#: ../SoftwareProperties/SoftwareProperties.py:110 +#, python-format +msgid "Every %s days" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:140 +#, python-format +msgid "After %s days" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 +msgid "Import key" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:423 +msgid "Error importing selected file" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:424 +msgid "The selected file may not be a GPG key file or it might be corrupt." +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:436 +msgid "Error removing the key" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:478 +#, python-format +msgid "" +"Error scaning the CD\n" +"\n" +"%s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:535 +msgid "Please enter a name for the disc" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +msgid "Please insert a disc in the drive:" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:92 +msgid "Broken packages" +msgstr "" + +#: ../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:135 +msgid "Can't upgrade required meta-packages" +msgstr "" + +#: ../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:145 +msgid "Could not calculate the upgrade" +msgstr "" + +#: ../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:169 +msgid "Error authenticating some packages" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:170 +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:233 +#, python-format +msgid "Can't install '%s'" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:234 +msgid "" +"It was impossible to install a required package. Please report this as a " +"bug. " +msgstr "" + +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 +msgid "Can't guess meta-package" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:242 +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 " +"you are runing.\n" +" Please install one of the packages above first using synaptic or apt-get " +"before proceeding." +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:42 +msgid "Reading cache" +msgstr "" + +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 +msgid "No valid entry found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:107 +msgid "" +"While scaning your repository information no valid entry for the upgrade was " +"found.\n" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:124 +msgid "Repository information invalid" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:125 +msgid "" +"Upgrading the repository information resulted in a invalid file. Please " +"report this as a bug." +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:170 +msgid "Error during update" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:171 +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:190 +msgid "Not enough free disk space" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:191 +#, python-format +msgid "" +"The upgrade aborts now. Please free at least %s of disk space. Empty your " +"trash and remove temporary packages of former installations using 'sudo apt-" +"get clean'." +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:197 +msgid "Do you want to start the upgrade?" +msgstr "" + +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 +msgid "Could not install the upgrades" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "" +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:231 +msgid "" +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 +msgid "" +"Some problem occured during the clean-up. Please see the below message for " +"more information. " +msgstr "" + +#. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 +msgid "Checking package manager" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:317 +msgid "Updating repository information" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:331 +msgid "Asking for confirmation" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:335 +msgid "Upgrading" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:342 +msgid "Searching for obsolete software" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:347 +msgid "System upgrade is complete." +msgstr "" + +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 +#, python-format +msgid "Please insert '%s' into the drive '%s'" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 +msgid "Download is complete" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#, python-format +msgid "Downloading file %li of %li at %s/s" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 +#, python-format +msgid "%s remaining" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 +#, python-format +msgid "Downloading file %li of %li" +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:140 +msgid "Applying changes" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 +#, python-format +msgid "Could not install '%s'" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 +msgid "The upgrade aborts now. Please report this bug." +msgstr "" + +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +msgid "A fatal error occured" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 +msgid "" +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 +#, python-format +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 +#, python-format +msgid "%s new package is going to be installed." +msgid_plural "%s new packages are going to be installed." +msgstr[0] "" +msgstr[1] "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 +#, python-format +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 +#, python-format +msgid "You have to download a total of %s." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 +msgid "" +"The upgrade can take several hours and cannot be canceled at any time later." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 +msgid "To prevent data loss close all open applications and documents." +msgstr "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 +msgid "Could not find any upgrades" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 +msgid "Your system has already been upgraded." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 +#, python-format +msgid "Remove %s" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 +#, python-format +msgid "Install %s" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 +#, python-format +msgid "Upgrade %s" +msgstr "" + +#: ../DistUpgrade/DistUpgradeView.py:75 +msgid "Reboot required" +msgstr "" + +#: ../DistUpgrade/DistUpgradeView.py:76 +msgid "" +"The upgrade is finished and a reboot is required. Do you want to do this now?" +msgstr "" + +#. testcode to see if the bullets look nice in the dialog +#. for i in range(4): +#. view.setStep(i+1) +#. app.openCache() +#: ../DistUpgrade/DistUpgrade.glade.h:1 +#: ../data/SoftwarePropertiesDialogs.glade.h:1 +msgid " " +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:2 +msgid "" +"Cancel the running upgrade?\n" +"\n" +"The system could be in an unusable state if you cancel the upgrade. You are " +"strongly adviced to resume the upgrade." +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:5 +msgid "Restart the system to complete the upgrade" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:6 +msgid "Start the upgrade?" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:7 +msgid "" +"Upgrading to Ubuntu \"Dapper\" 6.06" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:8 +msgid "Cleaning up" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:9 +msgid "Details" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Difference between the files" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:11 +msgid "Downloading and installing the upgrades" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:12 +msgid "Modifying the software channels" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Preparing the upgrade" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:15 +msgid "Terminal" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:16 +msgid "Upgrading Ubuntu" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Replace" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 +msgid "_Resume Upgrade" +msgstr "" + +#: ../data/UpdateManager.glade.h:1 +msgid "" +"You must check for updates manually\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 "" +"Checking for available updates\n" +"\n" +"Software updates can correct errors, eliminate security vulnerabilities, and " +"provide new features to you." +msgstr "" + +#: ../data/UpdateManager.glade.h:7 +msgid "Keep your system up-to-date" +msgstr "" + +#: ../data/UpdateManager.glade.h:8 +msgid "Cancel _Download" +msgstr "" + +#: ../data/UpdateManager.glade.h:9 +msgid "Changes" +msgstr "" + +#: ../data/UpdateManager.glade.h:10 +msgid "Chec_k" +msgstr "" + +#: ../data/UpdateManager.glade.h:11 +msgid "Check for available updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 +msgid "Description" +msgstr "" + +#: ../data/UpdateManager.glade.h:13 +msgid "Release Notes" +msgstr "" + +#: ../data/UpdateManager.glade.h:14 +msgid "Show details" +msgstr "" + +#: ../data/UpdateManager.glade.h:15 +msgid "Show progress of single files" +msgstr "" + +#: ../data/UpdateManager.glade.h:16 +msgid "Software Updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:17 +msgid "" +"Software updates can correct errors, eliminate security vulnerabilities, and " +"provide new features to you." +msgstr "" + +#: ../data/UpdateManager.glade.h:18 +msgid "U_pgrade" +msgstr "" + +#: ../data/UpdateManager.glade.h:19 +msgid "Upgrade to the latest version of Ubuntu" +msgstr "" + +#: ../data/UpdateManager.glade.h:20 +msgid "_Check" +msgstr "" + +#: ../data/UpdateManager.glade.h:21 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:22 +msgid "_Install Updates" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:1 +msgid "Channels" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:2 +msgid "Internet updates" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:3 +msgid "Keys" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:4 +msgid "Add _Cdrom" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:5 +msgid "Authentication" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:6 +msgid "D_elete downloaded software files:" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:7 +msgid "Import the public key from a trusted software provider" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:8 +msgid "Installation Media" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:9 +msgid "Internet Updates" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 +msgid "Restore _Defaults" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:12 +msgid "Restore the default keys of your distribution" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:13 +msgid "Software Preferences" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:14 +msgid "_Check for updates automatically:" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:15 +msgid "_Download updates in the background, but do not install them" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:2 +msgid " " +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"The channel information is out-of-date\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 +msgid "Channel" +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:9 +msgid "Comment:" +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +msgid "Components:" +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 +msgid "Distribution:" +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:12 +msgid "Sections" +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:13 +msgid "Type:" +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:14 +msgid "URI:" +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:15 +msgid "" +"Enter the complete APT line of the channel that you want to add\n" +"\n" +"The APT line contains the type, location and sections of a channel, for " +"example \"deb http://ftp.debian.org sarge main\"." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:18 +msgid "APT line:" +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:19 +msgid "Add Channel" +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:20 +msgid "" +"Binary\n" +"Source" +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:22 +msgid "Edit Channel" +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:23 +msgid "Scanning CD-ROM" +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:24 +msgid "_Add Channel" +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:25 +msgid "_Custom" +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +msgid "_Reload" +msgstr "" + +#: ../data/update-manager.desktop.in.h:1 +msgid "Show and install available updates" +msgstr "" + +#: ../data/update-manager.desktop.in.h:2 +msgid "Update Manager" +msgstr "" + +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + +#. ChangelogURI +#: ../channels/Ubuntu.info.in.h:4 +#, no-c-format +msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "" + +#. Description +#: ../channels/Ubuntu.info.in:6 +msgid "Ubuntu 6.06 'Dapper Drake'" +msgstr "" + +#. Description +#: ../channels/Ubuntu.info.in:23 +msgid "Ubuntu 6.06 Security Updates" +msgstr "" + +#. Description +#: ../channels/Ubuntu.info.in:40 +msgid "Ubuntu 6.06 Updates" +msgstr "" + +#. Description +#: ../channels/Ubuntu.info.in:57 +msgid "Ubuntu 6.06 Backports" +msgstr "" + +#. Description +#: ../channels/Ubuntu.info.in:74 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "" + +#. Description +#: ../channels/Ubuntu.info.in:91 +msgid "Ubuntu 5.10 Security Updates" +msgstr "" + +#. Description +#: ../channels/Ubuntu.info.in:108 +msgid "Ubuntu 5.10 Updates" +msgstr "" + +#. Description +#: ../channels/Ubuntu.info.in:125 +msgid "Ubuntu 5.10 Backports" +msgstr "" + +#. CompDescription +#: ../channels/Ubuntu.info.in:128 +msgid "Officially supported" +msgstr "" + +#. CompDescription +#: ../channels/Ubuntu.info.in:131 +msgid "Restricted copyright" +msgstr "" + +#. CompDescription +#: ../channels/Ubuntu.info.in:134 +msgid "Community maintained (Universe)" +msgstr "" + +#. CompDescription +#: ../channels/Ubuntu.info.in:137 +msgid "Non-free (Multiverse)" +msgstr "" + +#. ChangelogURI +#: ../channels/Debian.info.in.h:4 +#, no-c-format +msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "" + +#. Description +#: ../channels/Debian.info.in:6 +msgid "Debian 3.1 \"Sarge\"" +msgstr "" + +#. BaseURI +#: ../channels/Debian.info.in:19 +msgid "http://security.debian.org/" +msgstr "" + +#. Description +#: ../channels/Debian.info.in:20 +msgid "Debian 3.1 \"Sarge\" Security Updates" +msgstr "" + +#. Description +#: ../channels/Debian.info.in:34 +msgid "Debian \"Etch\" (testing)" +msgstr "" + +#. BaseURI +#: ../channels/Debian.info.in:47 +msgid "http://http.us.debian.org/debian/" +msgstr "" + +#. Description +#: ../channels/Debian.info.in:48 +msgid "Debian \"Sid\" (unstable)" +msgstr "" + +#. CompDescription +#: ../channels/Debian.info.in:51 +msgid "Oficially supported" +msgstr "" + +#. CompDescription +#: ../channels/Debian.info.in:54 +msgid "DFSG-compatible Software with Non-Free Dependencies" +msgstr "" + +#. CompDescription +#: ../channels/Debian.info.in:57 +msgid "Non-DFSG-compatible Software" +msgstr "" -- cgit v1.2.3 From f6ebff3d202238ae73942212b97096535c63b5e1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 3 Apr 2006 16:27:28 +0200 Subject: * DistUpgrade/DistUpgradeViewNonInteractive.py: - fix the non-interactive confirmChanges() view method --- DistUpgrade/DistUpgradeView.py | 2 +- DistUpgrade/DistUpgradeViewNonInteractive.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py index 14ac5208..57b94636 100644 --- a/DistUpgrade/DistUpgradeView.py +++ b/DistUpgrade/DistUpgradeView.py @@ -54,7 +54,7 @@ class DistUpgradeView(object): 5. Complete """ pass - def confirmChanges(self, summary, changes, downloadSize): + def confirmChanges(self, summary, changes, downloadSize, actions=None): """ display the list of changed packages (apt.Package) and return if the user confirms them """ diff --git a/DistUpgrade/DistUpgradeViewNonInteractive.py b/DistUpgrade/DistUpgradeViewNonInteractive.py index 7a8fa7eb..dbf38387 100644 --- a/DistUpgrade/DistUpgradeViewNonInteractive.py +++ b/DistUpgrade/DistUpgradeViewNonInteractive.py @@ -60,8 +60,8 @@ class DistUpgradeViewNonInteractive(DistUpgradeView): 5. Complete """ pass - def confirmChanges(self, summary, changes, downloadSize): - DistUpgradeView.confirmChanges(self, summary, changes, downloadSize) + def confirmChanges(self, summary, changes, downloadSize, actions=None): + DistUpgradeView.confirmChanges(self, summary, changes, downloadSize, actions) logging.debug("toinstall: '%s'" % self.toInstall) logging.debug("toupgrade: '%s'" % self.toUpgrade) logging.debug("toremove: '%s'" % self.toRemove) -- cgit v1.2.3 From 37fff00bab8c39bd52d02239c241cf4d6b1c72a3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 13 Apr 2006 16:10:44 +0200 Subject: * releaeannouncement typo fixed --- DistUpgrade/ReleaseAnnouncement | 48 +++++++++++++++++++++++++++++++++++++++++ DistUpgrade/build-dist.sh | 2 +- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 DistUpgrade/ReleaseAnnouncement (limited to 'DistUpgrade') diff --git a/DistUpgrade/ReleaseAnnouncement b/DistUpgrade/ReleaseAnnouncement new file mode 100644 index 00000000..b34d1e76 --- /dev/null +++ b/DistUpgrade/ReleaseAnnouncement @@ -0,0 +1,48 @@ +The Ubuntu team is proud to announce a test version of Ubuntu 6.04. + +* THIS IS A DEVELOPMENT SNAPSHOT * + +Ubuntu is a Linux distribution for your desktop or server, with a +fast and easy install, regular releases, a tight selection of +excellent packages installed by default, every other package you can +imagine available from the network, a commitment to security updates +for 18 months after each release and professional technical support +from many companies around the world. + + +Feedback and Helping +-------------------- + +If you would like to help shape Ubuntu, take a look at the list of +ways you can participate at + + http://www.ubuntu.com/community/participate/ + +Your comments, bug reports, patches and suggestions will help ensure +that our next release is the best release of Ubuntu ever. Please +report bugs through Launchpad: + + http://launchpad.net/distros/ubuntu/+bugs + +If you have a question, or if you think you may have found a bug but +aren't sure, first try asking on the #ubuntu IRC channel on Freenode, +on the Ubuntu Users mailing list, or on the Ubuntu forums: + + http://lists.ubuntu.com/mailman/listinfo/ubuntu-users + http://www.ubuntuforums.org/ + + +More Information +---------------- + +You can find out more about Ubuntu on our website, IRC channel and wiki. +If you're new to Ubuntu, please visit: + + http://www.ubuntu.com/ + + +To sign up for future Ubuntu announcements, please subscribe to Ubuntu's +very low volume announcement list at: + + http://lists.ubuntu.com/mailman/listinfo/ubuntu-announce + diff --git a/DistUpgrade/build-dist.sh b/DistUpgrade/build-dist.sh index f48c4e39..fd06fede 100755 --- a/DistUpgrade/build-dist.sh +++ b/DistUpgrade/build-dist.sh @@ -11,7 +11,7 @@ TARGETDIR=../dist-upgrade-build SOURCEDIR=`pwd` DIST=dapper MAINTAINER="Michael Vogt " -NOTES=ReleaseAnouncement +NOTES=ReleaseAnnouncement version=$(date +%Y%m%d.%H%M) # create targetdir -- cgit v1.2.3 From a34c35a2528041e658e541692adaa8b542a2e086 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 13 Apr 2006 16:25:19 +0200 Subject: * fix api change in aptsources.py --- DistUpgrade/DistUpgradeControler.py | 4 ++-- po/update-manager.pot | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'DistUpgrade') diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 0277969d..17ba46ee 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -30,7 +30,7 @@ import re import statvfs from DistUpgradeConfigParser import DistUpgradeConfig -from aptsources import SourcesList, SourceEntry +from aptsources import SourcesList, SourceEntry, is_mirror from gettext import gettext as _ from DistUpgradeCache import MyCache @@ -82,7 +82,7 @@ class DistUpgradeControler(object): # check if it's a mirror (or offical site) validMirror = False for mirror in valid_mirrors: - if self.sources.is_mirror(mirror,entry.uri): + if is_mirror(mirror,entry.uri): validMirror = True if entry.dist in toDists: # so the self.sources.list is already set to the new diff --git a/po/update-manager.pot b/po/update-manager.pot index 1b0873aa..477f2827 100644 --- a/po/update-manager.pot +++ b/po/update-manager.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-04-13 12:19+0200\n" +"POT-Creation-Date: 2006-04-13 16:15+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- cgit v1.2.3