From 301765d757df2c0cac9e3cea61ccc842f92fb660 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 21 Feb 2006 19:45:39 +0100 Subject: * write the log to /var/log/dist-upgrade* --- DistUpgrade/DistUpgradeCache.py | 2 +- DistUpgrade/DistUpgradeViewGtk.py | 2 +- DistUpgrade/dist-upgrade.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index ab7e24a4..1711ef1b 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -19,7 +19,7 @@ class MyCache(apt.Cache): # turn on debuging apt_pkg.Config.Set("Debug::pkgProblemResolver","true") - fd = os.open(os.path.expanduser("~/dist-upgrade-apt.log"), os.O_RDWR|os.O_CREAT|os.O_TRUNC) + fd = os.open("/var/log/dist-upgrade-apt.log", os.O_RDWR|os.O_CREAT|os.O_TRUNC) os.dup2(fd,1) os.dup2(fd,2) diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 9bd55d24..3697a49e 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -235,7 +235,7 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): self._term.set_font_from_string("monospace 10") self._term.connect("contents-changed", self._term_content_changed) self._terminal_lines = [] - self._terminal_log = open(os.path.expanduser("~/dist-upgrade-term.log"),"w") + self._terminal_log = open("/var/log/dist-upgrade-term.log","w") return self._term def _term_content_changed(self, term): " called when the *visible* part of the terminal changes " diff --git a/DistUpgrade/dist-upgrade.py b/DistUpgrade/dist-upgrade.py index 437be42d..632de54d 100755 --- a/DistUpgrade/dist-upgrade.py +++ b/DistUpgrade/dist-upgrade.py @@ -9,7 +9,7 @@ import sys if __name__ == "__main__": logging.basicConfig(level=logging.DEBUG, - filename=os.path.expanduser("~/dist-upgrade.log"), + filename="/var/log/dist-upgrade.log", format='%(asctime)s %(levelname)s %(message)s', filemode='w') -- cgit v1.2.3 From 0e06105183cd1757ce4369bc778ece8363330fbf Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 22 Feb 2006 16:59:54 +0100 Subject: * make the dist-upgrade tool fully self-contained * po/*: make update-po --- DistUpgrade/DistInfo.py | 1 + DistUpgrade/aptsources.py | 1 + DistUpgrade/build-tarball.sh | 4 +- po/bg.po | 200 ++++++++++------- po/da.po | 195 +++++++++------- po/de.po | 205 ++++++++++------- po/el.po | 183 ++++++++------- po/en_CA.po | 204 ++++++++++------- po/en_GB.po | 203 ++++++++++------- po/es.po | 205 ++++++++++------- po/fi.po | 204 ++++++++++------- po/fr.po | 205 ++++++++++------- po/gl.po | 200 ++++++++++------- po/he.po | 200 ++++++++++------- po/hu.po | 201 ++++++++++------- po/it.po | 200 ++++++++++------- po/ja.po | 204 ++++++++++------- po/lt.po | 202 ++++++++++------- po/mk.po | 203 ++++++++++------- po/nb.po | 203 ++++++++++------- po/ne.po | 204 ++++++++++------- po/nl.po | 181 +++++++++------ po/no.po | 203 ++++++++++------- po/pa.po | 188 +++++++++------- po/pl.po | 205 ++++++++++------- po/pt_BR.po | 525 +++++++++++++++++++++++++++++++------------ po/ro.po | 196 +++++++++------- po/rw.po | 210 ++++++++++------- po/sv.po | 227 +++++++++++-------- po/uk.po | 203 ++++++++++------- po/vi.po | 197 +++++++++------- po/xh.po | 183 ++++++++------- po/zh_CN.po | 195 +++++++++------- po/zh_HK.po | 200 ++++++++++------- po/zh_TW.po | 200 ++++++++++------- 35 files changed, 4024 insertions(+), 2716 deletions(-) create mode 120000 DistUpgrade/DistInfo.py create mode 120000 DistUpgrade/aptsources.py diff --git a/DistUpgrade/DistInfo.py b/DistUpgrade/DistInfo.py new file mode 120000 index 00000000..bdcd1ba6 --- /dev/null +++ b/DistUpgrade/DistInfo.py @@ -0,0 +1 @@ +../UpdateManager/Common/DistInfo.py \ No newline at end of file diff --git a/DistUpgrade/aptsources.py b/DistUpgrade/aptsources.py new file mode 120000 index 00000000..2f041121 --- /dev/null +++ b/DistUpgrade/aptsources.py @@ -0,0 +1 @@ +../SoftwareProperties/aptsources.py \ No newline at end of file diff --git a/DistUpgrade/build-tarball.sh b/DistUpgrade/build-tarball.sh index 57185c34..9f01b87c 100755 --- a/DistUpgrade/build-tarball.sh +++ b/DistUpgrade/build-tarball.sh @@ -16,7 +16,7 @@ if [ ! -h $DIST ]; then ln -s dist-upgrade.py $DIST fi -# create the tarbal -tar -c -z -v --exclude=$DIST.tar.gz --exclude=$0 -f $DIST.tar.gz . +# create the tarball, copy links in place +tar -c -h -z -v --exclude=$DIST.tar.gz --exclude=$0 -f $DIST.tar.gz . diff --git a/po/bg.po b/po/bg.po index 6b90c1a9..5a0964fe 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-20 09:36+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-22 16:57+0100\n" "PO-Revision-Date: 2005-07-22 19:24+0300\n" "Last-Translator: Rostislav \"zbrox\" Raykov \n" "Language-Team: Bulgarian \n" @@ -247,49 +247,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -msgid "Perform Upgrade?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "Грешка при премахване на ключа" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -297,54 +300,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "Друга програма за управление на пакетите е стартирана." -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Обновлението е завършено" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -352,66 +355,82 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "Инсталиране на обновленията..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." msgstr "" +"Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като " +"грешка." -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +msgid "Your system has already been upgraded." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Ключове" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Инсталиране" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "Обновлението е завършено" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -432,56 +451,72 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Допълнителна информация" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Resume Upgrade" +msgstr "" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates\n" "Language-Team: Danish \n" @@ -238,49 +238,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -#, fuzzy -msgid "Perform Upgrade?" -msgstr "Opgradering færdig" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" +msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -msgid "Error fetching the packages" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -288,54 +291,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "En anden pakkehåndtering er i gang" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Opgradering færdig" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -343,65 +346,79 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 msgid "Installing updates" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +#, fuzzy +msgid "Your system has already been upgraded." +msgstr "Dit system har ødelagte pakker!" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Detaljer" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Installér" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "Opgradering færdig" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -422,57 +439,74 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 #, fuzzy msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "Arkiver er ændret" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Detaljer" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Resume Upgrade" +msgstr "Opgradering færdig" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates\n" "Language-Team: German GNOME Translations \n" @@ -252,50 +252,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -#, fuzzy -msgid "Perform Upgrade?" -msgstr "Aktualisierung fertiggestellt" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" +msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "Fehler beim Entfernen des Schlüssels" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -303,54 +305,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "Ein andere Paketverwaltung läuft bereits" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Aktualisierung fertiggestellt" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -358,66 +360,83 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "Aktualisierungen werden installiert..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." msgstr "" +"Der gewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie " +"hierfür einen Fehlerbericht." -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +#, fuzzy +msgid "Your system has already been upgraded." +msgstr "Das System enthält defekte Pakete!" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Details" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Installieren" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "Aktualisierung fertiggestellt" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -438,57 +457,74 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 #, fuzzy msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "Ubuntu wird aktualisiert" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Details" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Resume Upgrade" +msgstr "Aktualisierung fertiggestellt" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updatesSources" #~ msgstr "Paketquellen" @@ -852,9 +892,6 @@ msgstr "" #~ msgid "_Download upgradable packages" #~ msgstr "Aktualisierbare Pakete herunter_laden" -#~ msgid "Your system has broken packages!" -#~ msgstr "Das System enthält defekte Pakete!" - #~ msgid "" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." diff --git a/po/el.po b/po/el.po index d7ce56de..0e58916d 100644 --- a/po/el.po +++ b/po/el.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: el\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-20 09:36+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-22 16:57+0100\n" "PO-Revision-Date: 2005-03-05 14:33+0200\n" "Last-Translator: Kostas Papadimas \n" "Language-Team: Greek \n" @@ -236,48 +236,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -msgid "Perform Upgrade?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -msgid "Error fetching the packages" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -285,52 +289,52 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -338,64 +342,77 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 msgid "Installing updates" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Ενότητες:" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" +#, python-format +msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, python-format +msgid "Upgrade %s" msgstr "" #: ../DistUpgrade/DistUpgradeView.py:67 @@ -417,56 +434,72 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Ενότητες:" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Resume Upgrade" +msgstr "" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates\n" "Language-Team: Canadian English \n" @@ -245,50 +245,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -#, fuzzy -msgid "Perform Upgrade?" -msgstr "Upgrade finished" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" +msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "Error removing the key" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -296,54 +298,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "Another package manager is running" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Upgrade finished" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -351,66 +353,82 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "Installing updates..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." msgstr "" +"The key you selected could not be removed. Please report this as a bug." -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +#, fuzzy +msgid "Your system has already been upgraded." +msgstr "Your system has broken packages!" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Details" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Install" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "Upgrade finished" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -431,56 +449,73 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Details" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Resume Upgrade" +msgstr "Upgrade finished" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updatesSources" #~ msgstr "Software Sources" @@ -838,9 +877,6 @@ msgstr "" #~ msgid "_Download upgradable packages" #~ msgstr "_Download upgradable packages" -#~ msgid "Your system has broken packages!" -#~ msgstr "Your system has broken packages!" - #~ msgid "" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." diff --git a/po/en_GB.po b/po/en_GB.po index 909b1b9b..eae8881f 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-20 09:36+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-22 16:57+0100\n" "PO-Revision-Date: 2005-04-19 22:51-0400\n" "Last-Translator: Abigail Brady \n" "Language-Team: \n" @@ -247,49 +247,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -msgid "Perform Upgrade?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "Error removing the key" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -297,55 +300,55 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "Another package manager is running" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 #, fuzzy msgid "Asking for confirmation" msgstr "Checking system configuration" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Upgrade finished" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -353,66 +356,82 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "Installing updates..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." msgstr "" +"The key you selected could not be removed. Please report this as a bug." -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +#, fuzzy +msgid "Your system has already been upgraded." +msgstr "Your system has broken packages!" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Details" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Install" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "Upgrade finished" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -433,56 +452,72 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Details" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Resume Upgrade" +msgstr "" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates\n" "Language-Team: Spanish \n" @@ -253,50 +253,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -#, fuzzy -msgid "Perform Upgrade?" -msgstr "Actualización finalizada" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" +msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "Hubo un error al quitar la clave" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -304,54 +306,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "Ya hay otro gestor de paquetes en ejecución" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Actualización finalizada" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -359,66 +361,83 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "Instalando actualizaciones..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." msgstr "" +"No se puede quitar la clave que ha seleccionado. Por favor, avise de esto " +"como un fallo." -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +#, fuzzy +msgid "Your system has already been upgraded." +msgstr "¡Su sistema tiene paquetes rotos!" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Detalles:" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Instalar" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "Actualización finalizada" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -439,56 +458,73 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Detalles:" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Resume Upgrade" +msgstr "Actualización finalizada" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updatesSources" #~ msgstr "Orígenes de software" @@ -848,9 +888,6 @@ msgstr "" #~ msgid "_Download upgradable packages" #~ msgstr "_Descargar paquetes actualizables" -#~ msgid "Your system has broken packages!" -#~ msgstr "¡Su sistema tiene paquetes rotos!" - #~ msgid "" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." diff --git a/po/fi.po b/po/fi.po index 1b182e0f..c9d7c97e 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-20 09:36+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-22 16:57+0100\n" "PO-Revision-Date: 2005-03-30 08:30+0200\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" @@ -244,50 +244,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -#, fuzzy -msgid "Perform Upgrade?" -msgstr "Päivitykset suoritettu" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" +msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "Virhe poistettaessa avainta" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -295,54 +297,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "Toinen pakettienhallinta on käynnissä" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Päivitykset suoritettu" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -350,65 +352,81 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 msgid "Installing updates" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." msgstr "" +"Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus." -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +#, fuzzy +msgid "Your system has already been upgraded." +msgstr "Järjestelmässä on rikkinäisiä paketteja!" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Yksityiskohdat" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Asenna" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "Päivitykset suoritettu" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -429,56 +447,73 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Yksityiskohdat" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Resume Upgrade" +msgstr "Päivitykset suoritettu" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updatesSources" #~ msgstr "Ohjelmalähteet" @@ -836,9 +875,6 @@ msgstr "" #~ msgid "_Download upgradable packages" #~ msgstr "_Lataa päivitettävät paketit" -#~ msgid "Your system has broken packages!" -#~ msgstr "Järjestelmässä on rikkinäisiä paketteja!" - #~ msgid "" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." diff --git a/po/fr.po b/po/fr.po index 07b443b4..5f98866d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.37.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-20 09:36+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-22 16:57+0100\n" "PO-Revision-Date: 2005-04-04 19:43+0200\n" "Last-Translator: \n" "Language-Team: French \n" @@ -250,50 +250,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -#, fuzzy -msgid "Perform Upgrade?" -msgstr "Mise à jour terminée" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" +msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "Erreur lors de la suppression de la clé" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -301,54 +303,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "Un autre gestionnaire de paquets est en fonctionnement" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Mise à jour terminée" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -356,66 +358,83 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "Installation des mises à jour..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." msgstr "" +"La clé que vous avez sélectionné ne peut être supprimé. Veuillez envoyer " +"ceci comme étant un bug." -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +#, fuzzy +msgid "Your system has already been upgraded." +msgstr "Votre système a des paquets cassés !" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Détails" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Installer" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "Mise à jour terminée" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -436,56 +455,73 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Détails" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Resume Upgrade" +msgstr "Mise à jour terminée" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updatesSources" #~ msgstr "Sources des logiciels" @@ -845,9 +885,6 @@ msgstr "" #~ msgid "_Download upgradable packages" #~ msgstr "_Télécharger les paquets pouvant être mis à jour" -#~ msgid "Your system has broken packages!" -#~ msgstr "Votre système a des paquets cassés !" - #~ msgid "" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." diff --git a/po/gl.po b/po/gl.po index eff57b70..02daf88d 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: gl\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-20 09:36+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-22 16:57+0100\n" "PO-Revision-Date: 2005-12-02 15:59+0100\n" "Last-Translator: Ignacio Casal Quinteiro \n" "Language-Team: Galego\n" @@ -249,49 +249,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -msgid "Perform Upgrade?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "Erro ao quitar a clave" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -299,54 +302,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "Xa hai outro xestor de paquetes en execución" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Actualización rematada" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -354,66 +357,82 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "Instalando actualizacións..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." msgstr "" +"Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un " +"erro." -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +msgid "Your system has already been upgraded." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Claves" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Instalar" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "Actualización rematada" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -434,56 +453,72 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Detalles" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Resume Upgrade" +msgstr "" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates\n" @@ -244,49 +244,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -msgid "Perform Upgrade?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "שגיאה בהסרת המפתח" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -294,54 +297,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "מנהל חבילות אחר רץ" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "השדרוג הסתיים" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -349,66 +352,80 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "מתקין עדכונים..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." +msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג." -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +msgid "Your system has already been upgraded." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "מפתחות" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "_התקן" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "השדרוג הסתיים" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -429,56 +446,72 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "פרטים" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Resume Upgrade" +msgstr "" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates\n" "Language-Team: Hungarian \n" @@ -246,50 +246,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -#, fuzzy -msgid "Perform Upgrade?" -msgstr "A frissítés befejeződött" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" +msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "Hiba a kulcs eltávolítása közben" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -297,54 +299,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "Már fut egy másik csomagkezelő" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "A frissítés befejeződött" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -352,66 +354,79 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "Frissítések telepítése..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." msgstr "" +"Az Ön által kijelölt kulcs nem távolítható el. Kérem jelentse ezt hibaként." -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +msgid "%s new package is going to be installed." +msgid_plural "%s new packages are going to be installed." +msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +#, fuzzy +msgid "Your system has already been upgraded." +msgstr "A rendszerén törött csomagok vannak!" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Részletek" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Telepítés" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "A frissítés befejeződött" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -432,56 +447,73 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Részletek" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Resume Upgrade" +msgstr "A frissítés befejeződött" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updatesSources" #~ msgstr "Szoftverforrások" @@ -840,9 +876,6 @@ msgstr "" #~ msgid "_Download upgradable packages" #~ msgstr "Frissíthető csomagok letöltése" -#~ msgid "Your system has broken packages!" -#~ msgstr "A rendszerén törött csomagok vannak!" - #~ msgid "" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." diff --git a/po/it.po b/po/it.po index 53fb20d8..f97e6041 100644 --- a/po/it.po +++ b/po/it.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-20 09:36+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-22 16:57+0100\n" "PO-Revision-Date: 2005-10-26 12:25+0200\n" "Last-Translator: Fabio Marzocca \n" "Language-Team: Italian \n" @@ -249,49 +249,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -msgid "Perform Upgrade?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "Errore rimuovendo la chiave" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -299,54 +302,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "Un altro gestore di pacchetti è in esecuzione" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Aggiornamento terminato" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -354,66 +357,82 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "Installazione degli aggiornamenti..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." msgstr "" +"La chiave selezionata non può essere rimossa. Per favore riporta questo come " +"bug." -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +msgid "Your system has already been upgraded." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Chiavi" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Installa" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "Aggiornamento terminato" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -434,56 +453,72 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Dettagli" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Resume Upgrade" +msgstr "" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates\n" "Language-Team: Ubuntu-ja \n" @@ -244,49 +244,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -msgid "Perform Upgrade?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "キー削除のエラー" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -294,54 +297,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "他のパッケージマネージャが動いています" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "アップグレードが終了しました" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -349,66 +352,81 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "アップデートをインストール中..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." +msgstr "選択したキーを削除できませんでした。バグとして報告してください。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +#, fuzzy +msgid "Your system has already been upgraded." +msgstr "システムに壊れたパッケージがあります！" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "詳細" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "インストール(_I)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "アップグレードが終了しました" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -429,56 +447,72 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "詳細" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Resume Upgrade" +msgstr "" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updatesSources" #~ msgstr "ソフトウェア取得元" @@ -694,9 +732,6 @@ msgstr "" #~ msgid "Cancel downloading of the changelog" #~ msgstr "変更点の取得を中止" -#~ msgid "_Install" -#~ msgstr "インストール(_I)" - #~ msgid "Choose a key-file" #~ msgstr "キーファイルを選択" @@ -891,9 +926,6 @@ msgstr "" #~ "\n" #~ "パッケージリストをサーバから再取得する必要があります。今すぐ実行しますか?" -#~ msgid "Your system has broken packages!" -#~ msgstr "システムに壊れたパッケージがあります！" - #~ msgid "" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." diff --git a/po/lt.po b/po/lt.po index 9e4aeb5b..92a29232 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-20 09:36+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-22 16:57+0100\n" "PO-Revision-Date: 2005-09-15 15:06+0300\n" "Last-Translator: Žygimantas Beručka \n" "Language-Team: Lithuanian \n" @@ -244,49 +244,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -msgid "Perform Upgrade?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "Šalinant raktą įvyko klaida" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -294,54 +297,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "Šiuo metu jau veikia kita paketų tvarkyklė" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Atnaujinimas baigtas" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -349,66 +352,84 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "Diegiami atnaujinimai..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." msgstr "" +"Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą." -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +msgid "%s new package is going to be installed." +msgid_plural "%s new packages are going to be installed." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +msgid "Your system has already been upgraded." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Raktai" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "Į_diegti" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "Atnaujinimas baigtas" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -429,56 +450,72 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Detalės" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Resume Upgrade" +msgstr "" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates\n" "Language-Team: Macedonian \n" @@ -248,49 +248,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -msgid "Perform Upgrade?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "Грешка при отстранување на клучот" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -298,54 +301,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "Веќе работи друг менаџер за пакети" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Надградбата е завршена" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -353,66 +356,85 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "Инсталирам надградби..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." msgstr "" +"Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова " +"како бубачка." -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +msgid "%s new package is going to be installed." +msgid_plural "%s new packages are going to be installed." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +msgid "Your system has already been upgraded." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Копчиња" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Инсталирај" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "Надградбата е завршена" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -433,56 +455,72 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Детали" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Resume Upgrade" +msgstr "" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates\n" "Language-Team: Norwegian Bokmal \n" @@ -247,49 +247,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -msgid "Perform Upgrade?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "Feil under fjerning av nøkkel" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -297,55 +300,55 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "En annen pakkehåndterer kjører" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 #, fuzzy msgid "Asking for confirmation" msgstr "Undersøker systemkonfigurasjon" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Oppgradering fullført" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -353,66 +356,82 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "Installerer oppdateringer..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." msgstr "" +"Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +#, fuzzy +msgid "Your system has already been upgraded." +msgstr "Systemet har ødelagte pakker!" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Detaljer" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Installer" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "Oppgradering fullført" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -433,56 +452,72 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Detaljer" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Resume Upgrade" +msgstr "" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates\n" "Language-Team: Nepali \n" @@ -246,49 +246,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -msgid "Perform Upgrade?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "कुञ्जि हटाउँदा त्रुटि" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -296,54 +299,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "अर्को प्याकेज व्यवस्थापक चलिरेको छ" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "स्तरवृद्धि समाप्त" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -351,66 +354,81 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." +msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस" -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +#, fuzzy +msgid "Your system has already been upgraded." +msgstr "तपाईंको प्रणालीमा टुटेका प्याकेजहरु छन!" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "विवरणहरु" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "स्थापना गर्नुहोस" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "स्तरवृद्धि समाप्त" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -431,56 +449,72 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "विवरणहरु" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Resume Upgrade" +msgstr "" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updatesवितरण:" @@ -988,9 +1023,6 @@ msgstr "" #~ "तपाईको परिवर्तनहरुले प्रभाव लिनको लागि तपाईंले सर्भरहरु बाट प्याकेज सुची फेरि लोड " #~ "गर्नुपर्दछ. के तपाईं यो अहिले गर्न चाहनुहुन्छ?" -#~ msgid "Your system has broken packages!" -#~ msgstr "तपाईंको प्रणालीमा टुटेका प्याकेजहरु छन!" - #~ msgid "" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." diff --git a/po/nl.po b/po/nl.po index f4b45b17..1d2b5c09 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-20 09:36+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-22 16:57+0100\n" "PO-Revision-Date: 2005-07-13 06:24+0100\n" "Last-Translator: Michiel Sikkes \n" "Language-Team: Nederlands \n" @@ -230,48 +230,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -msgid "Perform Upgrade?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -msgid "Error fetching the packages" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -279,52 +283,52 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -332,64 +336,77 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 msgid "Installing updates" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 +#, 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:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be removed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +msgid "Your system has already been upgraded." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be installed: %s" +msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 #, python-format -msgid "To be upgraded: %s" +msgid "Remove %s" msgstr "" -#. print "on_window_main_delete_event()" #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" +#, python-format +msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, python-format +msgid "Upgrade %s" msgstr "" #: ../DistUpgrade/DistUpgradeView.py:67 @@ -411,55 +428,71 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Resume Upgrade" +msgstr "" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates\n" "Language-Team: Norwegian Bokmal \n" @@ -247,49 +247,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -msgid "Perform Upgrade?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "Feil under fjerning av nøkkel" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -297,55 +300,55 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "En annen pakkehåndterer kjører" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 #, fuzzy msgid "Asking for confirmation" msgstr "Undersøker systemkonfigurasjon" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Oppgradering fullført" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -353,66 +356,82 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "Installerer oppdateringer..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." msgstr "" +"Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +#, fuzzy +msgid "Your system has already been upgraded." +msgstr "Systemet har ødelagte pakker!" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Detaljer" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Installer" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "Oppgradering fullført" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -433,56 +452,72 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Detaljer" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Resume Upgrade" +msgstr "" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates\n" "Language-Team: Punjabi \n" @@ -238,48 +238,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -msgid "Perform Upgrade?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -msgid "Error fetching the packages" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -287,53 +291,53 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -341,66 +345,79 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +msgid "Your system has already been upgraded." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "ਵੇਰਵਾ" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -421,56 +438,73 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "ਵੇਰਵਾ" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Resume Upgrade" +msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates\n" "Language-Team: Polish \n" @@ -241,50 +241,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -#, fuzzy -msgid "Perform Upgrade?" -msgstr "Aktualizowanie zakończone" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" +msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "Błąd podczas usuwania klucza" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -292,54 +294,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "Działa inny menadżer pakietów" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Aktualizowanie zakończone" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -347,66 +349,81 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "Instalacja pakietów..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." +msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd." -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +#, fuzzy +msgid "Your system has already been upgraded." +msgstr "Twój system zawiera uszkodzone pakiety!" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Szczegóły" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Instaluj" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "Aktualizowanie zakończone" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -427,56 +444,73 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Szczegóły" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Resume Upgrade" +msgstr "Aktualizowanie zakończone" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updatesSources" #~ msgstr "Źródła oprogramowania" @@ -838,9 +876,6 @@ msgstr "" #~ msgid "_Download upgradable packages" #~ msgstr "_Pobierz uaktualnione pakiety" -#~ msgid "Your system has broken packages!" -#~ msgstr "Twój system zawiera uszkodzone pakiety!" - #~ msgid "" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." diff --git a/po/pt_BR.po b/po/pt_BR.po index f9c9bace..4113629c 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-22 16:57+0100\n" "PO-Revision-Date: 2006-02-19 17:39-0300\n" "Last-Translator: Carlos Eduardo Pedroza Santiviago \n" "Language-Team: Ubuntu-BR \n" @@ -52,60 +52,72 @@ msgid "Internet Updates" msgstr "Atualizações via Internet" #: ../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 "Restaurar Pa_drões" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 msgid "Restore the default keys of your distribution" msgstr "Restaurar as chaves padrão da sua distribuição" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Preferências de Programas" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 msgid "_Check for updates automatically:" msgstr "Verifi_car por atualizações automaticamente:" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "_Obter atualizações em segundo plano, mas não instalá-las" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +#, fuzzy +msgid "_Install security updates without confirmation" msgstr "_Instalar novas atualizações sem confirmação" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "A cada %s dias" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "Após %s dias" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "Importar Chave" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "Erro importando o arquivo selecionado" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." -msgstr "O arquivo selecionado pode não ser um arquivo de chave GPG ou pode estar corrompido." +msgstr "" +"O arquivo selecionado pode não ser um arquivo de chave GPG ou pode estar " +"corrompido." -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "Erro removendo a chave" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." -msgstr "A chave que você selecionou não pôde se removida. Por favor reporte isto como um erro." +msgstr "" +"A chave que você selecionou não pôde se removida. Por favor reporte isto " +"como um erro." -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -116,11 +128,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "Por favor digite um nome para o disco" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "Por favor insira um disco no drive:" @@ -129,8 +141,13 @@ msgid "Broken packages" msgstr "Pacotes quebrados" #: ../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 "O seu sistema possui pacotes quebrados que não puderam ser fixados com este programa. Por favor, arrume-os primeiro usando o Synaptic ou apt-get antes de continuar." +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 "" +"O seu sistema possui pacotes quebrados que não puderam ser fixados com este " +"programa. Por favor, arrume-os primeiro usando o Synaptic ou apt-get antes " +"de continuar." #: ../DistUpgrade/DistUpgradeCache.py:135 msgid "Can't upgrade required meta-packages" @@ -146,8 +163,12 @@ msgid "Could not calculate the upgrade" msgstr "Não foi possível calcular a atualização" #: ../DistUpgrade/DistUpgradeCache.py:146 -msgid "A unresolvable problem occured while calculating the upgrade. Please report this as a bug. " -msgstr "Um problema sem resolução ocorreu enquanto calculando a atualização. Por favor reporte isto como um erro." +msgid "" +"A unresolvable problem occured while calculating the upgrade. Please report " +"this as a bug. " +msgstr "" +"Um problema sem resolução ocorreu enquanto calculando a atualização. Por " +"favor reporte isto como um erro." #. FIXME: maybe ask a question here? instead of failing? #: ../DistUpgrade/DistUpgradeCache.py:168 @@ -155,8 +176,14 @@ msgid "Error authenticating some packages" msgstr "Erro autenticando alguns pacotes" #: ../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 "Não foi possível autenticar alguns pacotes. Isso poder devido a um problema de rede. Você pode tentar de novo depois. Veja abaixo uma lista dos pacotes não-autenticados." +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 "" +"Não foi possível autenticar alguns pacotes. Isso poder devido a um problema " +"de rede. Você pode tentar de novo depois. Veja abaixo uma lista dos pacotes " +"não-autenticados." #: ../DistUpgrade/DistUpgradeCache.py:232 #, python-format @@ -164,8 +191,12 @@ msgid "Can't install '%s'" msgstr "Não foi possível instalar '%s'" #: ../DistUpgrade/DistUpgradeCache.py:233 -msgid "It was impossible to install a required package. Please report this as a bug. " -msgstr "Não foi possível instalar um pacote requerido. Por favor reporte isto como um erro." +msgid "" +"It was impossible to install a required package. Please report this as a " +"bug. " +msgstr "" +"Não foi possível instalar um pacote requerido. Por favor reporte isto como " +"um erro." #. FIXME: provide a list #: ../DistUpgrade/DistUpgradeCache.py:240 @@ -174,11 +205,17 @@ msgstr "Não foi possível adivinhar o meta-pacote" #: ../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 you are runing.\n" -" Please install one of the packages above first using synaptic or apt-get before proceeding." +"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 "" -"O seu sistema não possui um pacote ubuntu-desktop, kubuntu-desktop ou edubuntu-desktop e não foi possível detectar qual versão do Ubuntu você está executando.\n" -"Por favor instale um desses pacotes primeiro usando o Synaptic ou apt-get antes de continuar." +"O seu sistema não possui um pacote ubuntu-desktop, kubuntu-desktop ou " +"edubuntu-desktop e não foi possível detectar qual versão do Ubuntu você está " +"executando.\n" +"Por favor instale um desses pacotes primeiro usando o Synaptic ou apt-get " +"antes de continuar." #: ../DistUpgrade/DistUpgradeControler.py:42 msgid "Reading cache" @@ -190,185 +227,245 @@ msgid "No valid entry found" msgstr "Nenhuma entrada válida encontrada" #: ../DistUpgrade/DistUpgradeControler.py:108 -msgid "While scaning your repository information no valid entry for the upgrade was found.\n" -msgstr "Enquanto analisava as informações de repositórios não foi encontrada uma entrada válida para a atualização.\n" +msgid "" +"While scaning your repository information no valid entry for the upgrade was " +"found.\n" +msgstr "" +"Enquanto analisava as informações de repositórios não foi encontrada uma " +"entrada válida para a atualização.\n" #: ../DistUpgrade/DistUpgradeControler.py:125 msgid "Repository information invalid" msgstr "Informação de repositório inválida" #: ../DistUpgrade/DistUpgradeControler.py:126 -msgid "Upgrading the repository information resulted in a invalid file. Please report this as a bug." -msgstr "Atualizando a informações de repositórios resultou em um arquivo inválido. Por favor reporte isso como um erro." +msgid "" +"Upgrading the repository information resulted in a invalid file. Please " +"report this as a bug." +msgstr "" +"Atualizando a informações de repositórios resultou em um arquivo inválido. " +"Por favor reporte isso como um erro." #: ../DistUpgrade/DistUpgradeControler.py:171 msgid "Error during update" msgstr "Erro durante a atualização" #: ../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 "Um problema ocorreu durante a atualização. Isso geralmente pode ser por problemas de rede, por favor verifique a sua conexão de rede e tente novamente." +msgid "" +"A problem occured during the update. This is usually some sort of network " +"problem, please check your network connection and retry." +msgstr "" +"Um problema ocorreu durante a atualização. Isso geralmente pode ser por " +"problemas de rede, por favor verifique a sua conexão de rede e tente " +"novamente." -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +#, fuzzy +msgid "Not enough free disk space" msgstr "Espaço em disco insuficiente" -#: ../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 "Não há espaço suficiente no seu sistema para obter os pacotes requeridos. Por favor libere algum espaço antes de tentar novamente. Como: 'sudo apt-get clean'" +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, 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:196 -msgid "Perform Upgrade?" -msgstr "Realizar a Atualização?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +#, fuzzy +msgid "Do you want to start the upgrade?" +msgstr "Não foi possível calcular a atualização" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" -msgstr "Erro ao aplicar as mudanças" +#: ../DistUpgrade/DistUpgradeControler.py:214 +#, fuzzy +msgid "Could not install the upgrades" +msgstr "Não foi possível calcular a atualização" -#: ../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 "Alguns problemas ocorreram durante a atualização. É bem provável que alguns pacotes falharam ao instalar. Tente 'sudo apt-get install -f' ou Synaptic para corrigir o seu sistema." +#: ../DistUpgrade/DistUpgradeControler.py:215 +#, fuzzy +msgid "" +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." +msgstr "" +"Alguns problemas ocorreram durante a atualização. É bem provável que alguns " +"pacotes falharam ao instalar. Tente 'sudo apt-get install -f' ou Synaptic " +"para corrigir o seu sistema." -#: ../DistUpgrade/DistUpgradeControler.py:228 -msgid "Error fetching the packages" -msgstr "Erro ao obter os pacotes" +#: ../DistUpgrade/DistUpgradeControler.py:230 +#, fuzzy +msgid "Could not download the upgrades" +msgstr "Não foi possível calcular a atualização" -#: ../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 "Alguns problemas ocorreram durante a obtenção dos pacotes. Isso é bem provável que seja por problemas de rede. Por favor verifique a sua conexão de rede e tente novamente." +#: ../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 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "Remover Pacotes obsoletos?" #: ../DistUpgrade/DistUpgradeControler.py:281 -msgid "Some problem occured during the clean-up. Please see the below message for more information. " -msgstr "Alguns problemas ocorreram durante a limpeza. Por favor veja as mensagens abaixo para maiores informações." +msgid "Error during commit" +msgstr "Erro ao aplicar as mudanças" + +#: ../DistUpgrade/DistUpgradeControler.py:282 +msgid "" +"Some problem occured during the clean-up. Please see the below message for " +"more information. " +msgstr "" +"Alguns problemas ocorreram durante a limpeza. Por favor veja as mensagens " +"abaixo para maiores informações." #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "Checking package manager" msgstr "Verificando o Gerenciador de Pacotes" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "Atualizando informação do repositório" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "Pedindi por confirmação" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 msgid "Upgrading" msgstr "Atualizando" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "Buscando programas obsoletos" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "A Atualização do Sistema está completa." #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Por favor insira '%s' no drive '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "O Download está completo" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 -#, python-format -msgid "Downloading file %li of %li with %s/s" +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#, fuzzy, python-format +msgid "Downloading file %li of %li at %s/s" msgstr "Obtendo arquivo %li de %li com %s/s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "Faltam %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 -#, python-format -msgid "Downloading file %li of %li with unknown speed" +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#, fuzzy, python-format +msgid "Downloading file %li of %li at unknown speed" msgstr "Obtendo arquivo %li de %li com velocidade desconhecida" #. 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:131 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 msgid "Installing updates" msgstr "Instalando Atualizações" -#: ../DistUpgrade/DistUpgradeViewGtk.py:144 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "Não foi possível instalar '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:145 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." msgstr "A atualização irá abortar. Por favor reporte o erro." -#: ../DistUpgrade/DistUpgradeViewGtk.py:216 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "Ocorreu um erro fatal" -#: ../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 "Durante a operação um erro fatal ocorreu. Por favor reporte isso como um erro e inclua os arquivos ~/dist-upgrade.log e ~/dist-upgrade-apt.log no seu relatório. A atualização irá abortar agora." - -#: ../DistUpgrade/DistUpgradeViewGtk.py:293 -#, python-format +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 +#, fuzzy msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" +"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 "" -"%s pacotes serão removidos.\n" -"%s pacotes serão instalados.\n" -"%s pacotes serão atualizados.\n" -"\n" -"%s precisam ser obtidos" +"Durante a operação um erro fatal ocorreu. Por favor reporte isso como um " +"erro e inclua os arquivos ~/dist-upgrade.log e ~/dist-upgrade-apt.log no seu " +"relatório. A atualização irá abortar agora." + +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#, fuzzy, python-format +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "Um pacote essencial teria que ser removido" +msgstr[1] "Um pacote essencial teria que ser removido" -#: ../DistUpgrade/DistUpgradeViewGtk.py:304 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "A serem removidos: %s " +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:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" -msgstr "A serem instalados: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +#, fuzzy +msgid "Could not find any upgrades" +msgstr "Não foi possível calcular a atualização" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +#, fuzzy +msgid "Your system has already been upgraded." +msgstr "Your system has broken packages!" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" -msgstr "A serem atualizados: %s" +msgid "You have to download a total of %s." +msgstr "" -#. print "on_window_main_delete_event()" #: ../DistUpgrade/DistUpgradeViewGtk.py:339 -msgid "Are you sure you want cancel?" -msgstr "Tem certeza que deseja cancelar?" +#, fuzzy, python-format +msgid "Remove %s" +msgstr "A serem removidos: %s " -#: ../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 "Cancelar durante a atualização pode deixar o sistema em um estado instável. É fortemente recomendável que a operação continue." +#: ../DistUpgrade/DistUpgradeViewGtk.py:341 +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Instalar Atualizações" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "At_ualizar" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" msgstr "Reinicialização requerida" #: ../DistUpgrade/DistUpgradeView.py:68 -msgid "The upgrade is finished now. A reboot is required to now, do you want to do this now?" -msgstr "A atualização está terminada. É necessário reiniciar o computador, você deseja fazer isso agora?" +msgid "" +"The upgrade is finished now. A reboot is required to now, do you want to do " +"this now?" +msgstr "" +"A atualização está terminada. É necessário reiniciar o computador, você " +"deseja fazer isso agora?" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): @@ -379,72 +476,101 @@ 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 "Reinicie o seu sistema para finalizar a atualização" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "Iniciar a Atualização?" -#: ../DistUpgrade/DistUpgrade.glade.h:4 -msgid "Upgrading to Ubuntu \"Dapper\" 6.04" -msgstr "Atualizando para o Ubuntu \"Dapper\" 6.04" +#: ../DistUpgrade/DistUpgrade.glade.h:7 +msgid "" +"Upgrading to Ubuntu \"Dapper\" 6.04" +msgstr "" +"Atualizando para o Ubuntu \"Dapper\" " +"6.04" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "Limpando" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 msgid "Details" msgstr "Detalhes" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "Obtendo e instalando as atualizações" -#: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +#: ../DistUpgrade/DistUpgrade.glade.h:11 +#, fuzzy +msgid "Modifying the software channels" msgstr "Modificando os canais de programas" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "Preparando a Atualização" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "Terminal" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "Atualizando o Ubuntu" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "Reportar _Erro" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "_Reiniciar Agora" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Resume Upgrade" +msgstr "Realizar a Atualização?" + #: ../data/UpdateManager.glade.h:1 msgid "" -"You need to manually reload the latest information about updates\n" +"You need to manually reload the latest information about updates\n" "\n" -"Your system does not check for updates automatically. You can configure this behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +"Your system does not check for updates automatically. You can configure this " +"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -"Você precisa recarregar manualmente as últimas informações sobre atualizações\n" +"Você precisa recarregar manualmente as últimas informações sobre " +"atualizações\n" "\n" -"O seu sistema não verifica automaticamente por atualizações. Você pode configurar esse comportamento em \"Sistema\" -> \"Administração\" -> \"Propriedades de Programas\"." +"O seu sistema não verifica automaticamente por atualizações. Você pode " +"configurar esse comportamento em \"Sistema\" -> \"Administração\" -> " +"\"Propriedades de Programas\"." #: ../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." +"Software updates can correct errors, eliminate security vulnerabilities, and " +"provide new features to you." msgstr "" "Verificando as Atualizações Disponíveis\n" "\n" -"Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades de segurança, e prover novas funcionalidades para você." +"Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades de " +"segurança, e prover novas funcionalidades para você." #: ../data/UpdateManager.glade.h:7 msgid "Keep your system up-to-date" @@ -493,8 +619,12 @@ msgid "Software Updates" msgstr "Atualizações de Programas" #: ../data/UpdateManager.glade.h:19 -msgid "Software updates can correct errors, eliminate security vulnerabilities, and provide new features to you." -msgstr "Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades de segurança, e prover novas funcionalidades para você." +msgid "" +"Software updates can correct errors, eliminate security vulnerabilities, and " +"provide new features to you." +msgstr "" +"Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades de " +"segurança, e prover novas funcionalidades para você." #: ../data/UpdateManager.glade.h:20 msgid "U_pgrade" @@ -557,8 +687,7 @@ msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 Security Updates" #. CompDescription -#: ../channels/Ubuntu.info.in:94 -#: ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51 msgid "Oficially supported" msgstr "Suportado Oficialmente" @@ -623,6 +752,55 @@ msgstr "Programa compatível com a DFSG mas com dependências não-livres" msgid "Non-DFSG-compatible Software" msgstr "Programas não compatíveis com a DFSG" +#~ msgid "" +#~ "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 "" +#~ "Não há espaço suficiente no seu sistema para obter os pacotes requeridos. " +#~ "Por favor libere algum espaço antes de tentar novamente. Como: 'sudo apt-" +#~ "get clean'" + +#~ msgid "Error fetching the packages" +#~ msgstr "Erro ao obter os pacotes" + +#~ 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 "" +#~ "Alguns problemas ocorreram durante a obtenção dos pacotes. Isso é bem " +#~ "provável que seja por problemas de rede. Por favor verifique a sua " +#~ "conexão de rede e tente novamente." + +#~ msgid "" +#~ "%s packages are going to be removed.\n" +#~ "%s packages are going to be newly installed.\n" +#~ "%s packages are going to be upgraded.\n" +#~ "\n" +#~ "%s needs to be fetched" +#~ msgstr "" +#~ "%s pacotes serão removidos.\n" +#~ "%s pacotes serão instalados.\n" +#~ "%s pacotes serão atualizados.\n" +#~ "\n" +#~ "%s precisam ser obtidos" + +#~ msgid "To be installed: %s" +#~ msgstr "A serem instalados: %s" + +#~ msgid "To be upgraded: %s" +#~ msgstr "A serem atualizados: %s" + +#~ msgid "Are you sure you want cancel?" +#~ msgstr "Tem certeza que deseja cancelar?" + +#~ msgid "" +#~ "Canceling during a upgrade can leave the system in a unstable state. It " +#~ "is strongly adviced to continue the operation. " +#~ msgstr "" +#~ "Cancelar durante a atualização pode deixar o sistema em um estado " +#~ "instável. É fortemente recomendável que a operação continue." + #, fuzzy #~ msgid "Sources" #~ msgstr "Software Sources" @@ -634,10 +812,13 @@ msgstr "Programas não compatíveis com a DFSG" #, fuzzy #~ msgid "Cancel downloading of the changelog" #~ msgstr "Cancel downloading the ChangeLog" + #~ msgid "Choose a key-file" #~ msgstr "Choose a key-file" + #~ msgid "Packages to install:" #~ msgstr "Packages to install:" + #~ msgid "" #~ "Available Updates\n" #~ "\n" @@ -648,22 +829,31 @@ msgstr "Programas não compatíveis com a DFSG" #~ "\n" #~ "The following packages are found to be upgradable. You can upgrade them " #~ "by using the Install button." + #~ msgid "Comment:" #~ msgstr "Comment:" + #~ msgid "Components" #~ msgstr "Components" + #~ msgid "Distribution:" #~ msgstr "Distribution:" + #~ msgid "Repository" #~ msgstr "Repository" + #~ msgid "Sections:" #~ msgstr "Sections:" + #~ msgid "Temporary files" #~ msgstr "Temporary files" + #~ msgid "Type:" #~ msgstr "Type:" + #~ msgid "URI:" #~ msgstr "URI:" + #~ msgid "User Interface" #~ msgstr "User Interface" @@ -678,6 +868,7 @@ msgstr "Programas não compatíveis com a DFSG" #~ "\n" #~ "You can add and remove authentication keys in this dialogue. A key makes " #~ "it possible to check verify the integrity of the software you download." + #~ msgid "" #~ "Enter the complete APT line of the repository that you want to " #~ "add\n" @@ -692,8 +883,10 @@ msgstr "Programas não compatíveis com a DFSG" #~ "The APT line contains the type, location and content of a repository, for " #~ "example \"deb http://ftp.debian.org sarge main\". You can find a " #~ "detailed description of the syntax in the documentation." + #~ msgid "APT line:" #~ msgstr "APT line:" + #~ msgid "A_uthentication" #~ msgstr "A_uthentication" @@ -704,22 +897,29 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgstr "" #~ "Add a new key file to the trusted keyring. Make sure that you got the key " #~ "over a secure channel and that you trust the owner. " + #~ msgid "Automatically clean _temporary packages files" #~ msgstr "Automatically clean _temporary packages files" + #~ msgid "" #~ "Binary\n" #~ "Source" #~ msgstr "" #~ "Binary\n" #~ "Source" + #~ msgid "Clean interval in days: " #~ msgstr "Clean interval in days: " + #~ msgid "Delete _old packages in the package cache" #~ msgstr "Delete _old packages in the package cache" + #~ msgid "Edit Repository..." #~ msgstr "Edit Repository..." + #~ msgid "Maximum age in days:" #~ msgstr "Maximum age in days:" + #~ msgid "Maximum size in MB:" #~ msgstr "Maximum size in MB:" @@ -730,30 +930,38 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgstr "" #~ "Restore the default keys shiped with the distribution. This will not " #~ "change user-installed keys." + #~ msgid "Set _maximum size for the package cache" #~ msgstr "Set _maximum size for the package cache" + #~ msgid "Settings" #~ msgstr "Settings" + #~ msgid "Show disabled software sources" #~ msgstr "Show disabled software sources" + #~ msgid "Update interval in days: " #~ msgstr "Update interval in days: " + #~ msgid "_Add Repository" #~ msgstr "_Add Repository" + #~ msgid "_Custom" #~ msgstr "_Custom" + #~ msgid "_Download upgradable packages" #~ msgstr "_Download upgradable packages" -#~ msgid "Your system has broken packages!" -#~ msgstr "Your system has broken packages!" + #~ msgid "" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." #~ msgstr "" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." + #~ msgid "It is not possible to upgrade all packages." #~ msgstr "It is not possible to upgrade all packages." + #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " @@ -764,38 +972,51 @@ msgstr "Programas não compatíveis com a DFSG" #~ "action (such as installing or removing packages) is required. Please use " #~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " #~ "situation." + #~ msgid "The following packages are not upgraded: " #~ msgstr "The following packages are not upgraded: " + #~ msgid "Changes not found, the server may not be updated yet." #~ msgstr "Changes not found, the server may not be updated yet." + #~ msgid "" #~ "Failed to download changes. Please check if there is an active internet " #~ "connection." #~ msgstr "" #~ "Failed to download changes. Please check if there is an active internet " #~ "connection." + #~ msgid "Version %s: \n" #~ msgstr "Version %s: \n" + #~ msgid "Downloading changes..." #~ msgstr "Downloading changes..." + #~ msgid "The updates are being applied." #~ msgstr "The updates are being applied." + #~ msgid "" #~ "You can run only one package management application at the same time. " #~ "Please close this other application first." #~ msgstr "" #~ "You can run only one package management application at the same time. " #~ "Please close this other application first." + #~ msgid "Updating package list..." #~ msgstr "Updating package list..." + #~ msgid "Your system is up-to-date!" #~ msgstr "Your system is up-to-date!" + #~ msgid "There are no updates available." #~ msgstr "There are no updates available." + #~ msgid "New version: %s" #~ msgstr "New version: %s" + #~ msgid "Your distribution is no longer supported" #~ msgstr "Your distribution is no longer supported" + #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " #~ "running will no longer get security fixes or other critical updates. " @@ -804,14 +1025,17 @@ msgstr "Programas não compatíveis com a DFSG" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " #~ "running will no longer get security fixes or other critical updates. " #~ "Please see http://www.ubuntulinux.org for upgrade information." + #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "There is a new release of Ubuntu available!" + #~ msgid "" #~ "A new release with the codename '%s' is available. Please see http://www." #~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" #~ "A new release with the codename '%s' is available. Please see http://www." #~ "ubuntulinux.org/ for upgrade instructions." + #~ msgid "Never show this message again" #~ msgstr "Never show this message again" @@ -822,36 +1046,52 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgstr "" #~ "You can run only one package management application at the same time. " #~ "Please close this other application first." + #~ msgid "Initializing and getting list of updates..." #~ msgstr "Initializing and getting list of updates..." + #~ msgid "You need to be root to run this program" #~ msgstr "You need to be root to run this program" + #~ msgid "Edit software sources and settings" #~ msgstr "Edit software sources and settings" + #~ msgid "Software Properties" #~ msgstr "Software Properties" + #~ msgid "Ubuntu Update Manager" #~ msgstr "Ubuntu Update Manager" + #~ msgid "Binary" #~ msgstr "Binary" + #~ msgid "Source" #~ msgstr "Source" + #~ msgid "CD" #~ msgstr "CD" + #~ msgid "Ubuntu 4.10 Security Updates" #~ msgstr "Ubuntu 4.10 Security Updates" + #~ msgid "Contributed software" #~ msgstr "Contributed software" + #~ msgid "Non-free software" #~ msgstr "Non-free software" + #~ msgid "US export restricted software" #~ msgstr "US export restricted software" + #~ msgid "Ubuntu Archive Automatic Signing Key " #~ msgstr "Ubuntu Archive Automatic Signing Key " + #~ msgid "Ubuntu CD Image Automatic Signing Key " #~ msgstr "Ubuntu CD Image Automatic Signing Key " + #~ msgid "Repositories changed" #~ msgstr "Repositories changed" + #~ msgid "" #~ "The repository information has changes. A backup copy of your sources." #~ "list is stored in %s.save. \n" @@ -875,4 +1115,3 @@ msgstr "Programas não compatíveis com a DFSG" #~ "\n" #~ "The following packages are found to be upgradable. You can upgrade them " #~ "by using the Install button." - diff --git a/po/ro.po b/po/ro.po index 2d100936..be0406f4 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-20 09:36+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-22 16:57+0100\n" "PO-Revision-Date: 2005-03-03 19:28+0200\n" "Last-Translator: Dan Damian \n" "Language-Team: Romanian \n" @@ -237,49 +237,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -#, fuzzy -msgid "Perform Upgrade?" -msgstr "Actualizare completă" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" +msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -msgid "Error fetching the packages" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -287,54 +290,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "Un alt manager de pachete rulează" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Actualizare completă" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -342,65 +345,79 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 msgid "Installing updates" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +#, fuzzy +msgid "Your system has already been upgraded." +msgstr "Sistemul dvs. este la zi!" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Detalii" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Instalează" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "Actualizare completă" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -421,56 +438,73 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Detalii" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Resume Upgrade" +msgstr "Actualizare completă" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates\n" "Language-Team: Kinyarwanda \n" @@ -251,50 +251,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -#, fuzzy -msgid "Perform Upgrade?" -msgstr "Byarangiye" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" +msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "i Urufunguzo" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -302,54 +304,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "Muyobozi ni" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Byarangiye" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -357,65 +359,84 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 msgid "Installing updates" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." +msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a" -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +#, fuzzy +msgid "Your system has already been upgraded." +msgstr "Sisitemu" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "You need to manually reload the latest information about updatesSources" #~ msgstr "\n" "Language-Team: Swedish \n" @@ -238,51 +238,55 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 +#: ../DistUpgrade/DistUpgradeControler.py:198 #, fuzzy -msgid "Perform Upgrade?" -msgstr "Uppgraderingar" +msgid "Do you want to start the upgrade?" +msgstr "Vill du ändå installera detta paket?" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" -msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:214 +#, fuzzy +msgid "Could not install the upgrades" +msgstr "inte installerad" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "Inga matchande paket hittades" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 #, fuzzy msgid "Remove obsolete Packages?" msgstr " Ta bort paket " #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -290,55 +294,55 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "En annan pakethanterare körs" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Uppgraderingar" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 #, fuzzy msgid "Download is complete" msgstr "Hämtning misslyckades" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -346,67 +350,81 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "Letar efter uppdateringar..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, fuzzy, python-format msgid "Could not install '%s'" msgstr "inte installerad" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 -#, fuzzy, python-format -msgid "To be installed: %s" +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 +#, python-format +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +#, fuzzy +msgid "Could not find any upgrades" msgstr "inte installerad" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +#, fuzzy +msgid "Your system has already been upgraded." +msgstr "Ditt system har trasiga paket!" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Detaljer" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -#, fuzzy -msgid "Are you sure you want cancel?" -msgstr "Är du säker på att du vill avsluta?" +#, fuzzy, python-format +msgid "Install %s" +msgstr "Installera" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "Uppgraderingar" #: ../DistUpgrade/DistUpgradeView.py:67 #, fuzzy @@ -428,56 +446,74 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 msgid "Details" msgstr "Detaljer" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 #, fuzzy msgid "Preparing the upgrade" msgstr "Förbereder transaktion" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +#, fuzzy +msgid "Restarting the system" +msgstr "Uppdaterar system" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Resume Upgrade" +msgstr "Uppgraderingar" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updatesSources" #~ msgstr "Programvarukällor" @@ -701,10 +749,6 @@ msgstr "Tillgängliga program" #~ msgid "Choose a key-file" #~ msgstr "Välj en spegel" -#, fuzzy -#~ msgid "Upgrading the system" -#~ msgstr "Uppdaterar system" - #~ msgid "Details" #~ msgstr "Detaljer" @@ -782,9 +826,6 @@ msgstr "Tillgängliga program" #~ msgid "_Download upgradable packages" #~ msgstr "_Hämta uppgraderingsbara paket" -#~ msgid "Your system has broken packages!" -#~ msgstr "Ditt system har trasiga paket!" - #~ msgid "It is not possible to upgrade all packages." #~ msgstr "Det går inte att uppgradera alla paket." @@ -943,9 +984,6 @@ msgstr "Tillgängliga program" #~ msgid "User Interface" #~ msgstr "Användargränssnitt" -#~ msgid "Install" -#~ msgstr "Installera" - #~ msgid "Version %s:" #~ msgstr "Version %s:" @@ -2128,9 +2166,6 @@ msgstr "Tillgängliga program" #~ msgid "%P%% (%V of %U)" #~ msgstr "%P%% (%V av %U)" -#~ msgid "Do you wish to install this package anyway?" -#~ msgstr "Vill du ändå installera detta paket?" - #~ msgid "Do not show this warning again." #~ msgstr "Visa inte denna varning igen." diff --git a/po/uk.po b/po/uk.po index eaebee98..1d9aec6e 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-20 09:36+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-22 16:57+0100\n" "PO-Revision-Date: 2005-08-08 11:46+0300\n" "Last-Translator: Maxim Dziumanenko \n" "Language-Team: Ukrainian \n" @@ -239,49 +239,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -msgid "Perform Upgrade?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "Помилка видалення ключа" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -289,54 +292,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "Вже активний інший менеджер пакетів" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Оновлення завершено" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -344,66 +347,83 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "Встановлення оновлень..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." +msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку." -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +msgid "%s new package is going to be installed." +msgid_plural "%s new packages are going to be installed." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +msgid "Your system has already been upgraded." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Клавіші" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Встановити" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "Оновлення завершено" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -424,56 +444,72 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Подробиці" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Resume Upgrade" +msgstr "" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates\n" "Language-Team: Vietnamese \n" @@ -240,49 +240,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -msgid "Perform Upgrade?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "Gặp lỗi khi gỡ bỏ khóa" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -290,54 +293,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "Một bộ quản lý gói khác đang chạy" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "Nâng cấp xong" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -345,66 +348,77 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "Đang cài đặt bản cập nhật..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." +msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này." -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +msgid "%s new package is going to be installed." +msgid_plural "%s new packages are going to be installed." +msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +msgid "Your system has already been upgraded." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "Khóa" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Cài đặt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "Nâng cấp xong" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -425,56 +439,72 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "Chi tiết" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Resume Upgrade" +msgstr "" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates\n" "Language-Team: Xhosa \n" @@ -235,48 +235,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -msgid "Perform Upgrade?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -msgid "Error fetching the packages" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -284,52 +288,52 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -337,65 +341,78 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "Seka zonke izihlaziyo" -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 +#, 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:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be removed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +msgid "Your system has already been upgraded." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be installed: %s" +msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 #, python-format -msgid "To be upgraded: %s" +msgid "Remove %s" msgstr "" -#. print "on_window_main_delete_event()" #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "Bonisa izihlaziyo" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, python-format +msgid "Upgrade %s" msgstr "" #: ../DistUpgrade/DistUpgradeView.py:67 @@ -417,55 +434,71 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Resume Upgrade" +msgstr "" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates\n" "Language-Team: zh_CN \n" @@ -237,49 +237,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -#, fuzzy -msgid "Perform Upgrade?" -msgstr "更新已经完成" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" +msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -msgid "Error fetching the packages" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -287,54 +290,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "正在运行另外一个软件包管理器" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "更新已经完成" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -342,65 +345,79 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 msgid "Installing updates" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +#, fuzzy +msgid "Your system has already been upgraded." +msgstr "您的系统有损坏的软件包！" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "细节" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "安装(_I)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "更新已经完成" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -421,56 +438,73 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "细节" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Resume Upgrade" +msgstr "更新已经完成" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates\n" "Language-Team: Chinese (traditional) \n" @@ -239,49 +239,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -msgid "Perform Upgrade?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "移除密碼匙時發生錯誤" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -289,54 +292,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "另一個套件管理員正在執行中" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "完成升級" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -344,66 +347,80 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "正在安裝軟件更新..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." +msgstr "你選定的密碼匙無法移除，請匯報問題。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +msgid "Your system has already been upgraded." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "密碼匙" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "安裝(_I)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "完成升級" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -424,56 +441,72 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "細節" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Resume Upgrade" +msgstr "" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates\n" "Language-Team: Chinese (traditional) \n" @@ -239,49 +239,52 @@ msgid "" "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 -msgid "Not enough free space" +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format 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'" +"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:196 -msgid "Perform Upgrade?" +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" msgstr "" #. installing the packages failed, can't be retried -#: ../DistUpgrade/DistUpgradeControler.py:211 -#: ../DistUpgrade/DistUpgradeControler.py:280 -msgid "Error during commit" +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:212 +#: ../DistUpgrade/DistUpgradeControler.py:215 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." +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:228 -#, fuzzy -msgid "Error fetching the packages" -msgstr "移除金鑰時發生錯誤" +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:229 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "" -"Some problem occured during the fetching of the packages. This is most " -"likely a network problem. Please check your network and try again. " +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:274 msgid "Remove obsolete Packages?" msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -289,54 +292,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:295 -#: ../DistUpgrade/DistUpgradeControler.py:318 +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 #, fuzzy msgid "Checking package manager" msgstr "另一個套件管理員正在執行中" -#: ../DistUpgrade/DistUpgradeControler.py:310 +#: ../DistUpgrade/DistUpgradeControler.py:311 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:324 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:328 +#: ../DistUpgrade/DistUpgradeControler.py:329 #, fuzzy msgid "Upgrading" msgstr "完成升級" -#: ../DistUpgrade/DistUpgradeControler.py:335 +#: ../DistUpgrade/DistUpgradeControler.py:336 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:340 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 #, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "" @@ -344,66 +347,80 @@ 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:133 +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 #, fuzzy msgid "Installing updates" msgstr "正在安裝軟體更新..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:147 -msgid "The upgrade will abort. Please report the bug." -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#, fuzzy +msgid "The upgrade aborts now. Please report this bug." +msgstr "您選定的金鑰無法移除，請匯報問題。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:218 +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 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. " +"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:295 +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 #, python-format -msgid "" -"%s packages are going to be removed.\n" -"%s packages are going to be newly installed.\n" -"%s packages are going to be upgraded.\n" -"\n" -"%s needs to be fetched" -msgstr "" +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 #, python-format -msgid "To be removed: %s" -msgstr "" +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:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format -msgid "To be installed: %s" +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +msgid "Your system has already been upgraded." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 #, python-format -msgid "To be upgraded: %s" +msgid "You have to download a total of %s." msgstr "" -#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "Remove %s" +msgstr "金鑰" + #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "安裝(_I)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:342 -msgid "" -"Canceling during a upgrade can leave the system in a unstable state. It is " -"strongly adviced to continue the operation. " -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "完成升級" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -424,56 +441,72 @@ 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:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "Start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "Upgrading to Ubuntu \"Dapper\" 6.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "細節" -#: ../DistUpgrade/DistUpgrade.glade.h:7 +#: ../DistUpgrade/DistUpgrade.glade.h:10 msgid "Downloading and installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:8 +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:9 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Preparing the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:10 +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Terminal" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Upgrading Ubuntu" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "_Report Bug" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:17 msgid "_Restart Now" msgstr "" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Resume Upgrade" +msgstr "" + #: ../data/UpdateManager.glade.h:1 msgid "" "You need to manually reload the latest information about updates Date: Thu, 23 Feb 2006 16:17:43 +0100 Subject: * debian/control: move to arch all * debian/changelog: updated --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1756819d..c5dd78ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +update-manager (0.42.2ubuntu6) dapper; urgency=low + + * SoftwareProperties/*: fix some UI problems (thanks to Sebastian Heinlein) + * debian/control: arch: all now + + -- Michael Vogt Thu, 23 Feb 2006 16:16:30 +0100 + update-manager (0.42.2ubuntu5) dapper; urgency=low * po/pt_BR.po: updated translation (thanks to diff --git a/debian/control b/debian/control index 314ec741..54dc884f 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 4.0.0), libxml-parser-perl, scrollkeeper, intltool, Standards-Version: 3.6.1.1 Package: update-manager -Architecture: any +Architecture: all Depends: ${python:Depends}, ${misc:Depends}, python, python-gnome2, python-glade2, python-apt (>= 0.6.15), synaptic (>= 0.57.8), lsb-release Description: GNOME application that manages apt updates This is the GNOME apt update manager. It checks for updates and lets the user -- cgit v1.2.3 From 2722df4ce2e4cd081e47d36a7c965829bad94f6b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 23 Feb 2006 19:51:34 +0100 Subject: * DistUpgrade/TODO: updated --- DistUpgrade/TODO | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/DistUpgrade/TODO b/DistUpgrade/TODO index 9d26eefc..df64b54b 100644 --- a/DistUpgrade/TODO +++ b/DistUpgrade/TODO @@ -5,6 +5,11 @@ hoary->breezy (it will crash otherwise) - send a "\n" on the libc6 question on hoary->breezy +breezy->dapper +-------------- +- gnome-icon-theme changes a lot, icons move from hicolor to gnome. + this might have caused a specatular crash during a upgrade + general ------- - CDROM upgrades !!! @@ -42,4 +47,4 @@ Robustness: as possible. The problem here is that e.g. if libnoitfy0 explodes and evolution, update-notifer depend on it, continuing means to evo and u-n can't be upgraded and dpkg explodes on them too. This is not more worse - than what we have right now I guess. \ No newline at end of file + than what we have right now I guess. -- cgit v1.2.3