diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-02-27 12:47:54 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-02-27 12:47:54 +0100 |
| commit | 165cd00f59347de8f1c46643c782e1d7d65b58a0 (patch) | |
| tree | 24805e11ebe6b5f8cab4dd78343feacdb5e69718 | |
| parent | d857aea25af73d85af83c60d88cf2f73f4402c15 (diff) | |
| parent | 0e06105183cd1757ce4369bc778ece8363330fbf (diff) | |
| download | python-apt-165cd00f59347de8f1c46643c782e1d7d65b58a0.tar.gz | |
* cherry picked from the main tree
| l--------- | DistUpgrade/DistInfo.py | 1 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeCache.py | 2 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeViewGtk.py | 2 | ||||
| l--------- | DistUpgrade/aptsources.py | 1 | ||||
| -rwxr-xr-x | DistUpgrade/build-tarball.sh | 4 | ||||
| -rwxr-xr-x | DistUpgrade/dist-upgrade.py | 2 | ||||
| -rw-r--r-- | po/bg.po | 200 | ||||
| -rw-r--r-- | po/da.po | 195 | ||||
| -rw-r--r-- | po/de.po | 205 | ||||
| -rw-r--r-- | po/el.po | 183 | ||||
| -rw-r--r-- | po/en_CA.po | 204 | ||||
| -rw-r--r-- | po/en_GB.po | 203 | ||||
| -rw-r--r-- | po/es.po | 205 | ||||
| -rw-r--r-- | po/fi.po | 204 | ||||
| -rw-r--r-- | po/fr.po | 205 | ||||
| -rw-r--r-- | po/gl.po | 200 | ||||
| -rw-r--r-- | po/he.po | 200 | ||||
| -rw-r--r-- | po/hu.po | 201 | ||||
| -rw-r--r-- | po/it.po | 200 | ||||
| -rw-r--r-- | po/ja.po | 204 | ||||
| -rw-r--r-- | po/lt.po | 202 | ||||
| -rw-r--r-- | po/mk.po | 203 | ||||
| -rw-r--r-- | po/nb.po | 203 | ||||
| -rwxr-xr-x | po/ne.po | 204 | ||||
| -rw-r--r-- | po/nl.po | 181 | ||||
| -rw-r--r-- | po/no.po | 203 | ||||
| -rw-r--r-- | po/pa.po | 188 | ||||
| -rw-r--r-- | po/pl.po | 205 | ||||
| -rw-r--r-- | po/pt_BR.po | 2974 | ||||
| -rw-r--r-- | po/ro.po | 196 | ||||
| -rw-r--r-- | po/rw.po | 210 | ||||
| -rw-r--r-- | po/sv.po | 227 | ||||
| -rw-r--r-- | po/uk.po | 203 | ||||
| -rw-r--r-- | po/vi.po | 197 | ||||
| -rw-r--r-- | po/xh.po | 183 | ||||
| -rw-r--r-- | po/zh_CN.po | 195 | ||||
| -rw-r--r-- | po/zh_HK.po | 200 | ||||
| -rw-r--r-- | po/zh_TW.po | 200 |
38 files changed, 4582 insertions, 4613 deletions
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/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/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/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') @@ -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 <zbrox@i-space.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Ключове</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>Допълнителна информация</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -687,6 +722,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "Грешка при премахване на ключа" + #~ msgid "Edit software sources and settings" #~ msgstr "Редактиране на източниците и настройките на софтуера" @@ -846,9 +885,6 @@ msgstr "" #~ msgid "Downloading Changes" #~ msgstr "Сваляне на промените" -#~ msgid "_Install" -#~ msgstr "_Инсталиране" - #, fuzzy #~ msgid "Debian sarge" #~ msgstr "Debian 3.1 „Sarge“" @@ -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-28 11:31+0200\n" "Last-Translator: Martin Willemoes Hansen <mwh@sysrq.dk>\n" "Language-Team: Danish <dansk@klid.dk>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Detaljer</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 #, fuzzy msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" msgstr "<span weight=\"bold\" size=\"larger\">Arkiver er ændret</span>" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "<b>Detaljer</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -828,9 +862,6 @@ msgstr "" #~ msgid "_Download upgradable packages" #~ msgstr "_Hent pakker der kan opgraderes" -#~ msgid "Your system has broken packages!" -#~ msgstr "Dit system har ødelagte pakker!" - #~ msgid "" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." @@ -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-04-02 08:46+0200\n" "Last-Translator: Frank Arnold <frank@scirocco-5v-turbo.de>\n" "Language-Team: German GNOME Translations <gnome-de@gnome.org>\n" @@ -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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Details</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 #, fuzzy msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" msgstr "<span weight=\"bold\" size=\"x-large\">Ubuntu wird aktualisiert</span>" -#: ../DistUpgrade/DistUpgrade.glade.h:5 +#: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:6 +#: ../DistUpgrade/DistUpgrade.glade.h:9 #, fuzzy msgid "Details" msgstr "<b>Details</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -698,6 +734,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "Fehler beim Entfernen des Schlüssels" + +#, fuzzy #~ msgid "<b>Sources</b>" #~ msgstr "<b>Paketquellen</b>" @@ -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." @@ -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 <pkst@gnome.org>\n" "Language-Team: Greek <team@gnome.gr>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Ενότητες:</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>Ενότητες:</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" diff --git a/po/en_CA.po b/po/en_CA.po index 6c15198c..9def7aad 100644 --- a/po/en_CA.po +++ b/po/en_CA.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-04-03 01:26-0500\n" "Last-Translator: Adam Weinberger <adamw@gnome.org>\n" "Language-Team: Canadian English <adamw@gnome.org>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Details</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>Details</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -688,6 +723,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "Error removing the key" + +#, fuzzy #~ msgid "<b>Sources</b>" #~ msgstr "<b>Software Sources</b>" @@ -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 <morwen@evilmagic.org>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Details</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>Details</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -688,6 +723,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "Error removing the key" + #~ msgid "Edit software sources and settings" #~ msgstr "Edit software sources and settings" @@ -848,9 +887,6 @@ msgstr "" #~ msgid "Downloading Changes" #~ msgstr "Downloading Changes" -#~ msgid "_Install" -#~ msgstr "_Install" - #, fuzzy #~ msgid "Debian sarge" #~ msgstr "Debian 3.1 \"Sarge\"" @@ -1033,9 +1069,6 @@ msgstr "" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" -#~ 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." @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: es\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 15:00+0200\n" "Last-Translator: Jorge Bernal <koke@amedias.org>\n" "Language-Team: Spanish <traductores@gnome.org>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Detalles:</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>Detalles:</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -696,6 +732,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "Hubo un error al quitar la clave" + +#, fuzzy #~ msgid "<b>Sources</b>" #~ msgstr "<b>Orígenes de software</b>" @@ -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." @@ -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 <timo.jyrinki@iki.fi>\n" "Language-Team: Finnish <LL@li.org>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Yksityiskohdat</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>Yksityiskohdat</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -686,6 +721,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "Virhe poistettaessa avainta" + +#, fuzzy #~ msgid "<b>Sources</b>" #~ msgstr "<b>Ohjelmalähteet</b>" @@ -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." @@ -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 <gnomefr@traduc.org>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Détails</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>Détails</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -693,6 +729,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "Erreur lors de la suppression de la clé" + +#, fuzzy #~ msgid "<b>Sources</b>" #~ msgstr "<b>Sources des logiciels</b>" @@ -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." @@ -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 <nacho.resa@gmail.com>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Claves</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>Detalles</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -689,6 +724,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "Erro ao quitar a clave" + #~ msgid "Edit software sources and settings" #~ msgstr "Editar fontes de software e preferencias" @@ -846,9 +885,6 @@ msgstr "" #~ msgid "Downloading Changes" #~ msgstr "Descargando cambios" -#~ msgid "_Install" -#~ msgstr "_Instalar" - #~ msgid "You need to be root to run this program" #~ msgstr "Necesita ser root para executar este programa" @@ -9,8 +9,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-08-07 14:49+0300\n" "Last-Translator: Yuval Tanny\n" "Language-Team: Hebrew <he@li.org>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>מפתחות</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>פרטים</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -684,6 +717,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "שגיאה בהסרת המפתח" + #~ msgid "Edit software sources and settings" #~ msgstr "ערוך מקורות תוכנה והגדרות" @@ -838,9 +875,6 @@ msgstr "" #~ msgid "Downloading Changes" #~ msgstr "מוריד שינוייים" -#~ msgid "_Install" -#~ msgstr "_התקן" - #, fuzzy #~ msgid "Debian sarge" #~ msgstr "דביאן 3.1 \"סארג'\"" @@ -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-04-03 12:32+0200\n" "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n" "Language-Team: Hungarian <gnome@gnome.hu>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Részletek</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>Részletek</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -689,6 +721,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "Hiba a kulcs eltávolítása közben" + +#, fuzzy #~ msgid "<b>Sources</b>" #~ msgstr "<b>Szoftverforrások</b>" @@ -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." @@ -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 <thesaltydog@gmail.com>\n" "Language-Team: Italian <it@li.org>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Chiavi</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>Dettagli</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -691,6 +726,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "Errore rimuovendo la chiave" + #~ msgid "Edit software sources and settings" #~ msgstr "Modifica le sorgenti e le impostazioni del software" @@ -850,9 +889,6 @@ msgstr "" #~ msgid "Downloading Changes" #~ msgstr "Download modifiche in corso" -#~ msgid "_Install" -#~ msgstr "_Installa" - #~ msgid "You need to be root to run this program" #~ msgstr "Devi essere root per eseguire questo programma" @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\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-12 17:28+0900\n" "Last-Translator: Ikuya Awashiro <ikuya@fruitsbasket.info>\n" "Language-Team: Ubuntu-ja <ubuntu-ja-users@freeml.com>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>詳細</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>詳細</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -683,6 +717,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "キー削除のエラー" + +#, fuzzy #~ msgid "<b>Sources</b>" #~ msgstr "<b>ソフトウェア取得元</b>" @@ -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." @@ -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 <uid0@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Raktai</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>Detalės</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -684,6 +721,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "Šalinant raktą įvyko klaida" + #~ msgid "Edit software sources and settings" #~ msgstr "Keisti programinės įrangos šaltinius ir nustatymus" @@ -842,9 +883,6 @@ msgstr "" #~ msgid "Downloading Changes" #~ msgstr "Parsiunčiami pakeitimai" -#~ msgid "_Install" -#~ msgstr "Į_diegti" - #, fuzzy #~ msgid "Debian sarge" #~ msgstr "Debian 3.1 „Sarge“" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: mk\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-20 01:21+0200\n" "Last-Translator: Арангел Ангов <ufo@linux.net.mk>\n" "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Копчиња</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>Детали</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -688,6 +726,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "Грешка при отстранување на клучот" + #~ msgid "Edit software sources and settings" #~ msgstr "Уреди софтверски извори и поставувања" @@ -847,9 +889,6 @@ msgstr "" #~ msgid "Downloading Changes" #~ msgstr "Преземам промени" -#~ msgid "_Install" -#~ msgstr "_Инсталирај" - #~ msgid "You need to be root to run this program" #~ msgstr "Треба да сте root за да ја извршите оваа програма" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: nb\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-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola <terance@lyse.net>\n" "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n" @@ -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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Detaljer</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>Detaljer</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -688,6 +723,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "Feil under fjerning av nøkkel" + #~ msgid "Edit software sources and settings" #~ msgstr "Rediger programvarekilder og instillinger" @@ -843,9 +882,6 @@ msgstr "" #~ msgid "Downloading Changes" #~ msgstr "Laster ned endringer" -#~ msgid "_Install" -#~ msgstr "_Installer" - #, fuzzy #~ msgid "Debian sarge" #~ msgstr "Debian 3.1 «Sarge»" @@ -1027,9 +1063,6 @@ msgstr "" #~ "Du må oppdatere pakkelisten fra tjenerene for at endringene skal tre i " #~ "kraft. Vil du gjøre det nå?" -#~ msgid "Your system has broken packages!" -#~ msgstr "Systemet har ødelagte pakker!" - #~ msgid "" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." @@ -7,8 +7,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-03 16:06+0545\n" "Last-Translator: Jaydeep Bhusal <zaydeep@hotmail.com>\n" "Language-Team: Nepali <info@mpp.org.np>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>विवरणहरु</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>विवरणहरु</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -687,6 +721,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "कुञ्जि हटाउँदा त्रुटि" + #~ msgid "Edit software sources and settings" #~ msgstr "सफ्टवेयर स्रोतहरु र सेटिंगहरु सम्पादन गर्नुहोस" @@ -844,9 +882,6 @@ msgstr "" #~ msgid "Downloading Changes" #~ msgstr "परिवर्तनहरु डाउनलोड गर्दै" -#~ msgid "_Install" -#~ msgstr "स्थापना गर्नुहोस" - #, fuzzy #~ msgid "Oficial Distribution" #~ msgstr "<b>वितरण:</b>" @@ -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." @@ -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 <michiels@gnome.org>\n" "Language-Team: Nederlands <vertaling@vrijschrift.org>\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 "<b>To be removed: %s</b>" +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 "<b>Remove %s</b>" 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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: nb\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-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola <terance@lyse.net>\n" "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n" @@ -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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Detaljer</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>Detaljer</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -688,6 +723,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "Feil under fjerning av nøkkel" + #~ msgid "Edit software sources and settings" #~ msgstr "Rediger programvarekilder og instillinger" @@ -843,9 +882,6 @@ msgstr "" #~ msgid "Downloading Changes" #~ msgstr "Laster ned endringer" -#~ msgid "_Install" -#~ msgstr "_Installer" - #, fuzzy #~ msgid "Debian sarge" #~ msgstr "Debian 3.1 «Sarge»" @@ -1027,9 +1063,6 @@ msgstr "" #~ "Du må oppdatere pakkelisten fra tjenerene for at endringene skal tre i " #~ "kraft. Vil du gjøre det nå?" -#~ msgid "Your system has broken packages!" -#~ msgstr "Systemet har ødelagte pakker!" - #~ msgid "" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: pa\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-23 10:48-0200\n" "Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n" "Language-Team: Punjabi <fedora-transa-pa@redhat.com>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>ਵੇਰਵਾ</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>ਵੇਰਵਾ</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager cvs\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-25 17:23+0100\n" "Last-Translator: Zygmunt Krynicki <zyga@www.suxx.pl>\n" "Language-Team: Polish <translators@gnomepl.org>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Szczegóły</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>Szczegóły</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -686,6 +720,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "Błąd podczas usuwania klucza" + +#, fuzzy #~ msgid "<b>Sources</b>" #~ msgstr "<b>Źródła oprogramowania</b>" @@ -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 662771e2..4113629c 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,13 +1,12 @@ -# Brazilian Portuguese translation for language-selector. -# This file is distributed under the same license as the language-selector package. -# Evandro Fernandes Giovanini <evandrofg@ig.com.br>, 2005. +# Portuguese Brazilian translation for update-manager +# This file is distributed under the same licence as the update-manager package. # msgid "" msgstr "" -"Project-Id-Version: language-selector\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 18:57+0100\n" -"PO-Revision-Date: 2006-02-19 17:05-0300\n" +"Project-Id-Version: update-manager\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 <segfault@ubuntu.com>\n" "Language-Team: Ubuntu-BR <tradutores@listas.ubuntubrasil.org>\n" "MIME-Version: 1.0\n" @@ -16,2202 +15,1103 @@ msgstr "" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: BRAZIL\n" -#: ../LanguageSelector/LanguageSelector.py:175 -#: ../data/languages.h:1 -msgid "Language" -msgstr "Idioma" +#: ../data/SoftwareProperties.glade.h:1 +msgid "<b>Channels</b>" +msgstr "<b>Canais</b>" -#: ../LanguageSelector/LanguageSelector.py:180 -msgid "Translations" -msgstr "Traduções" +#: ../data/SoftwareProperties.glade.h:2 +msgid "<b>Internet updates</b>" +msgstr "<b>Atualizações via Internet</b>" -#: ../LanguageSelector/LanguageSelector.py:189 -msgid "Writing Aids" -msgstr "Auxílios à Escrita" +#: ../data/SoftwareProperties.glade.h:3 +msgid "<b>Keys</b>" +msgstr "<b>Chaves</b>" -#: ../LanguageSelector/LanguageSelector.py:274 -msgid "The language support is not installed completely" -msgstr "O suporte ao idioma não está instalado completamente" +#: ../data/SoftwareProperties.glade.h:4 +msgid "Add _Cdrom" +msgstr "Adicionar _Cdrom" -#: ../LanguageSelector/LanguageSelector.py:275 -msgid "Not all translations or writing aids, that are available for the supported languages on your system, are installed." -msgstr "Nem todas as traduções ou auxílios à escrita, que estão disponíveis para os idiomas suportados no seu sistema, estão instalados." +#: ../data/SoftwareProperties.glade.h:5 +msgid "Authentication" +msgstr "Autenticação" -#: ../LanguageSelector/LanguageSelector.py:277 -msgid "_Remind Me Again" -msgstr "_Lembre-me Novamente" +#: ../data/SoftwareProperties.glade.h:6 +msgid "D_elete downloaded software files:" +msgstr "Apagar arquivos d_e programas obtidos:" -#: ../LanguageSelector/LanguageSelector.py:278 -msgid "_Install" -msgstr "_Instalar" +#: ../data/SoftwareProperties.glade.h:7 +msgid "Import the public key from a trusted software provider" +msgstr "Importar a chave pública de um fornecedor de programas confiável" -#: ../LanguageSelector/LanguageSelector.py:281 -msgid "Details" -msgstr "Detalhes" - -#: ../LanguageSelector/LanguageSelector.py:363 -msgid "Could not install the selected language support" -msgstr "Não foi possível instalar o suporte ao idioma selecionado" - -#: ../LanguageSelector/LanguageSelector.py:364 -msgid "This is perhaps a bug of this application. Please file a bug report at https://launchpad.net/bugs/bugs/+package/ against the 'language-selector' product." -msgstr "Isso parece ser um erro neste programa. Por favor preencha um relatório de erro em https://launchpad.net/bugs/bugs/+package/ sobre o produto 'language-selector'." - -#: ../LanguageSelector/LanguageSelector.py:387 -msgid "Could not install the full language support" -msgstr "Não foi possível instalar o suporte completo ao idioma" - -#: ../LanguageSelector/LanguageSelector.py:388 -msgid "Usually this is related to an error in your software archive or software manager. Check your software preferences in the menu \"Adminstration\"." -msgstr "Geralmente isso é relacionado a um erro no seu arquivos de pacotes ou gerenciador de programas. Verifique suas preferências de programas no menu \"Administração\"." - -#: ../LanguageSelector/LanguageSelector.py:413 -msgid "The list of available languages on the system has been updated." -msgstr "A lista de idiomas disponíveis no sistema foi atualizada." +#: ../data/SoftwareProperties.glade.h:8 +msgid "Installation Media" +msgstr "Mídia de Instalação" -#: ../LanguageSelector/LanguageSelector.py:475 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "Apenas um programa de gerenciamento de pacotes é permitido ser executado ao mesmo tempo" - -#: ../LanguageSelector/LanguageSelector.py:477 -msgid "Please close the other application e.g. \"Update Manager\", \"aptitude\" or \"Synaptic\" at first." -msgstr "Feche os outros programas, como o \"Gerenciador de Atualizações\", \"aptitude\" ou o \"Synaptic\" primeiro." - -#: ../LanguageSelector/LanguageSelector.py:496 -msgid "Software database is broken" -msgstr "A Base de Dados de programas está corrompida" - -#: ../LanguageSelector/LanguageSelector.py:497 -msgid "It is impossible to install or remove any software. Please use the package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix this issue at first." -msgstr "Não é possível instalar ou remover qualquer programa. Por favor use o Gerenciador de Pacotes \"Synaptic\" ou execute \"sudo apt-get install -f\" em um terminal para resolver esse probelma primeiro." - -#: ../data/LanguageSelector.glade.h:1 -msgid " " -msgstr " " +#: ../data/SoftwareProperties.glade.h:9 +msgid "Internet Updates" +msgstr "Atualizações via Internet" -#: ../data/LanguageSelector.glade.h:2 -msgid "<b>Default Language</b>" -msgstr "<b>Idioma Padrão</b>" - -#: ../data/LanguageSelector.glade.h:3 -msgid "<b>Supported Languages</b>" -msgstr "<b>Idiomas Suportados</b>" - -#: ../data/LanguageSelector.glade.h:4 +#: ../data/SoftwareProperties.glade.h:10 msgid "" -"<big><b>Checking available language support</b></big>\n" -"\n" -"The support for each langauge can differ in the amount of available translations or writing aids." +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" msgstr "" -"<big><b>Verificando suporte ao idioma</b></big>\n" -"\n" -"O suporte para cada idioma pode diferir na quantidade de traduções disponíveis ou auxílios à escrita." - -#: ../data/LanguageSelector.glade.h:7 -msgid "Default language for new user accounts and the login screen:" -msgstr "Idioma padrão para as novas contas de usuários e tela de entrada:" - -#: ../data/LanguageSelector.glade.h:8 -#: ../data/language-selector.desktop.in.h:2 -msgid "Language Support" -msgstr "Suporte a Idiomas" - -#: ../data/LanguageSelector.glade.h:9 -msgid "Translations include applications and documentation. The writing aids provide native dictionaries, grammar checkers and input methods" -msgstr "As Traduções abrangem os programas e documentação. Os Auxílios à Escrita fornecem dicionários nativos, verificadores gramaticais e métodos de entrada" - -#: ../data/countries.h:1 -msgid "Afghanistan" -msgstr "Afeganistão" - -#: ../data/countries.h:2 -msgid "Åland Islands" -msgstr "Ilhas Åland" - -#: ../data/countries.h:3 -msgid "Albania" -msgstr "Albânia" - -#: ../data/countries.h:4 -msgid "Algeria" -msgstr "Algéria" - -#: ../data/countries.h:5 -msgid "American Samoa" -msgstr "Samoa Americana" - -#: ../data/countries.h:6 -msgid "Andorra" -msgstr "Andorra" - -#: ../data/countries.h:7 -msgid "Angola" -msgstr "Angola" - -#: ../data/countries.h:8 -msgid "Anguilla" -msgstr "Ilhas Anguillas" - -#: ../data/countries.h:9 -msgid "Antigua and Barbuda" -msgstr "Antigua e Barbuda" - -#: ../data/countries.h:10 -msgid "Argentina" -msgstr "Argentina" - -#: ../data/countries.h:11 -msgid "Armenia" -msgstr "Armênia" - -#: ../data/countries.h:12 -msgid "Aruba" -msgstr "Aruba" - -#: ../data/countries.h:13 -msgid "Australia" -msgstr "Austrália" - -#: ../data/countries.h:14 -msgid "Austria" -msgstr "Áustria" - -#: ../data/countries.h:15 -msgid "Azerbaijan" -msgstr "Azerbaijão" - -#: ../data/countries.h:16 -msgid "Bahamas" -msgstr "Bahamas" - -#: ../data/countries.h:17 -msgid "Bahrain" -msgstr "Bahrein" - -#: ../data/countries.h:18 -msgid "Bangladesh" -msgstr "Bangladesh" - -#: ../data/countries.h:19 -msgid "Barbados" -msgstr "Barbados" - -#: ../data/countries.h:20 -msgid "Belarus" -msgstr "Belarus" - -#: ../data/countries.h:21 -msgid "Belgium" -msgstr "Bélgica" - -#: ../data/countries.h:22 -msgid "Belize" -msgstr "Belize" - -#: ../data/countries.h:23 -msgid "Benin" -msgstr "Benin" - -#: ../data/countries.h:24 -msgid "Bermuda" -msgstr "Bermuda" - -#: ../data/countries.h:25 -msgid "Bhutan" -msgstr "Butão" - -#: ../data/countries.h:26 -msgid "Bolivia" -msgstr "Bolívia" - -#: ../data/countries.h:27 -msgid "Bosnia and Herzegovina" -msgstr "Bósnia-Herzegóvina" - -#: ../data/countries.h:28 -msgid "Botswana" -msgstr "Botsuana" - -#: ../data/countries.h:29 -msgid "Brazil" -msgstr "Brasil" - -#: ../data/countries.h:30 -msgid "British Virgin Islands" -msgstr "Ilhas Virgens Inglesas" - -#: ../data/countries.h:31 -msgid "Brunei Darussalam" -msgstr "Brunei" - -#: ../data/countries.h:32 -msgid "Bulgaria" -msgstr "Bulgária" - -#: ../data/countries.h:33 -msgid "Burkina Faso" -msgstr "Burkina Fasso" - -#: ../data/countries.h:34 -msgid "Burundi" -msgstr "Burundi" - -#: ../data/countries.h:35 -msgid "Cambodia" -msgstr "Camboja" - -#: ../data/countries.h:36 -msgid "Cameroon" -msgstr "Camarões" - -#: ../data/countries.h:37 -msgid "Canada" -msgstr "Canadá" - -#: ../data/countries.h:38 -msgid "Cape Verde" -msgstr "Cabo Verde" - -#: ../data/countries.h:39 -msgid "Cayman Islands" -msgstr "Ilhas Cayman" - -#: ../data/countries.h:40 -msgid "Central African Republic" -msgstr "República Central Africana" - -#: ../data/countries.h:41 -msgid "Chad" -msgstr "Chade" - -#: ../data/countries.h:42 -msgid "Channel Islands" -msgstr "Ilhas Caymã" - -#: ../data/countries.h:43 -msgid "Chile" -msgstr "Chile" - -#: ../data/countries.h:44 -msgid "China" -msgstr "China" - -#: ../data/countries.h:45 -msgid "Hong Kong Special Administrative Region of China" -msgstr "Hong Knog Região Administrativa Especial da China" - -#: ../data/countries.h:46 -msgid "Macau Special Administrative Region of China" -msgstr "Macau Special Administrative Region of China" - -#: ../data/countries.h:47 -msgid "Colombia" -msgstr "Colômbia" - -#: ../data/countries.h:48 -msgid "Comoros" -msgstr "Comores" - -#: ../data/countries.h:49 -msgid "Congo" -msgstr "Congo" - -#: ../data/countries.h:50 -msgid "Cook Islands" -msgstr "Ilhas Cook" - -#: ../data/countries.h:51 -msgid "Costa Rica" -msgstr "Costa Rica" - -#: ../data/countries.h:52 -msgid "Côte d'Ivoire" -msgstr "Costa do Marfim" - -#: ../data/countries.h:53 -msgid "Croatia" -msgstr "Croácia" - -#: ../data/countries.h:54 -msgid "Cuba" -msgstr "Cuba" - -#: ../data/countries.h:55 -msgid "Cyprus" -msgstr "Chipre" - -#: ../data/countries.h:56 -msgid "Czech Republic" -msgstr "República Tcheca" - -#: ../data/countries.h:57 -msgid "Democratic People's Republic of Korea" -msgstr "República Democrática Popular da Coréia" - -#: ../data/countries.h:58 -msgid "Democratic Republic of the Congo" -msgstr "República Democrática do Congo" - -#: ../data/countries.h:59 -msgid "Denmark" -msgstr "Dinamarca" - -#: ../data/countries.h:60 -msgid "Djibouti" -msgstr "Djibuti" - -#: ../data/countries.h:61 -msgid "Dominica" -msgstr "Dominica" - -#: ../data/countries.h:62 -msgid "Dominican Republic" -msgstr "República Dominicana" - -#: ../data/countries.h:63 -msgid "Ecuador" -msgstr "Equador" - -#: ../data/countries.h:64 -msgid "Egypt" -msgstr "Egito" - -#: ../data/countries.h:65 -msgid "El Salvador" -msgstr "El Salvador" - -#: ../data/countries.h:66 -msgid "Equatorial Guinea" -msgstr "Guiné Equatorial" - -#: ../data/countries.h:67 -msgid "Eritrea" -msgstr "Eritreia" - -#: ../data/countries.h:68 -msgid "Estonia" -msgstr "Estônia" - -#: ../data/countries.h:69 -msgid "Ethiopia" -msgstr "Etiópia" - -#: ../data/countries.h:70 -msgid "Faeroe Islands" -msgstr "Faeroe Islands" - -#: ../data/countries.h:71 -msgid "Falkland Islands (Malvinas)" -msgstr "Ilhas Falkland (Malvinas)" - -#: ../data/countries.h:72 -#: ../data/languages.h:48 -msgid "Fiji" -msgstr "Fiji" - -#: ../data/countries.h:73 -msgid "Finland" -msgstr "Finlândia" - -#: ../data/countries.h:74 -msgid "France" -msgstr "França" - -#: ../data/countries.h:75 -msgid "French Guiana" -msgstr "Guiana Francesa" - -#: ../data/countries.h:76 -msgid "French Polynesia" -msgstr "Polinésia Francesa" - -#: ../data/countries.h:77 -msgid "Gabon" -msgstr "Gabão" - -#: ../data/countries.h:78 -msgid "Gambia" -msgstr "Gâmbia" - -#: ../data/countries.h:79 -msgid "Georgia" -msgstr "Geórgia" - -#: ../data/countries.h:80 -msgid "Germany" -msgstr "Alemanha" - -#: ../data/countries.h:81 -msgid "Ghana" -msgstr "Gana" - -#: ../data/countries.h:82 -msgid "Gibraltar" -msgstr "Gibraltar" - -#: ../data/countries.h:83 -msgid "Greece" -msgstr "Grécia" - -#: ../data/countries.h:84 -msgid "Greenland" -msgstr "Groenlândia" - -#: ../data/countries.h:85 -msgid "Grenada" -msgstr "Granada" - -#: ../data/countries.h:86 -msgid "Guadeloupe" -msgstr "Guadalupe" - -#: ../data/countries.h:87 -msgid "Guam" -msgstr "Guam" - -#: ../data/countries.h:88 -msgid "Guatemala" -msgstr "Guatemala" - -#: ../data/countries.h:89 -msgid "Guinea" -msgstr "Guiné" - -#: ../data/countries.h:90 -msgid "Guinea-Bissau" -msgstr "Guiné-Bissau" - -#: ../data/countries.h:91 -msgid "Guyana" -msgstr "Guiana" - -#: ../data/countries.h:92 -msgid "Haiti" -msgstr "Haití" - -#: ../data/countries.h:93 -msgid "Holy See" -msgstr "Santa Sé" - -#: ../data/countries.h:94 -msgid "Honduras" -msgstr "Honduras" - -#: ../data/countries.h:95 -msgid "Hungary" -msgstr "Hungria" - -#: ../data/countries.h:96 -msgid "Iceland" -msgstr "Islândia" - -#: ../data/countries.h:97 -msgid "India" -msgstr "Índia" - -#: ../data/countries.h:98 -msgid "Indonesia" -msgstr "Indonésia" - -#: ../data/countries.h:99 -msgid "Iran (Islamic Republic of)" -msgstr "Irã" - -#: ../data/countries.h:100 -msgid "Iraq" -msgstr "Iraque" - -#: ../data/countries.h:101 -msgid "Ireland" -msgstr "Irlanda" - -#: ../data/countries.h:102 -msgid "Isle of Man" -msgstr "Ilha de Man" - -#: ../data/countries.h:103 -msgid "Israel" -msgstr "Israel" - -#: ../data/countries.h:104 -msgid "Italy" -msgstr "Itália" - -#: ../data/countries.h:105 -msgid "Jamaica" -msgstr "Jamaica" - -#: ../data/countries.h:106 -msgid "Japan" -msgstr "Japão" - -#: ../data/countries.h:107 -msgid "Jordan" -msgstr "Jordão" - -#: ../data/countries.h:108 -msgid "Kazakhstan" -msgstr "Casaquistão" - -#: ../data/countries.h:109 -msgid "Kenya" -msgstr "Quênia" - -#: ../data/countries.h:110 -msgid "Kiribati" -msgstr "Kiribati" - -#: ../data/countries.h:111 -msgid "Kuwait" -msgstr "Kuait" - -#: ../data/countries.h:112 -msgid "Kyrgyzstan" -msgstr "Quirgistão" - -#: ../data/countries.h:113 -msgid "Lao People's Democratic Republic" -msgstr "República Democrática de Pessoas de Lao" - -#: ../data/countries.h:114 -msgid "Latvia" -msgstr "Latvia" - -#: ../data/countries.h:115 -msgid "Lebanon" -msgstr "Líbano" - -#: ../data/countries.h:116 -msgid "Lesotho" -msgstr "Lesoto" - -#: ../data/countries.h:117 -msgid "Liberia" -msgstr "Libéria" - -#: ../data/countries.h:118 -msgid "Libyan Arab Jamahiriya" -msgstr "Jamagiriya Líbia Arábica" - -#: ../data/countries.h:119 -msgid "Liechtenstein" -msgstr "Liechtenstein" - -#: ../data/countries.h:120 -msgid "Lithuania" -msgstr "Lituânia" - -#: ../data/countries.h:121 -msgid "Luxembourg" -msgstr "Luxemburgo" - -#: ../data/countries.h:122 -msgid "Madagascar" -msgstr "Madagascar" - -#: ../data/countries.h:123 -msgid "Malawi" -msgstr "Malawi" - -#: ../data/countries.h:124 -msgid "Malaysia" -msgstr "Malásia" - -#: ../data/countries.h:125 -msgid "Maldives" -msgstr "Maldivas" - -#: ../data/countries.h:126 -msgid "Mali" -msgstr "Mali" - -#: ../data/countries.h:127 -msgid "Malta" -msgstr "Malta" - -#: ../data/countries.h:128 -msgid "Marshall Islands" -msgstr "Ilhas Marshall" - -#: ../data/countries.h:129 -msgid "Martinique" -msgstr "Martinica" - -#: ../data/countries.h:130 -msgid "Mauritania" -msgstr "Mauritânia" - -#: ../data/countries.h:131 -msgid "Mauritius" -msgstr "Maurício" - -#: ../data/countries.h:132 -msgid "Mayotte" -msgstr "Mayotte" - -#: ../data/countries.h:133 -msgid "Mexico" -msgstr "México" - -#: ../data/countries.h:134 -msgid "Micronesia (Federated States of)" -msgstr "Estados Federados da Micronésia" - -#: ../data/countries.h:135 -msgid "Monaco" -msgstr "Mônaco" - -#: ../data/countries.h:136 -msgid "Mongolia" -msgstr "Mongólia" - -#: ../data/countries.h:137 -msgid "Montserrat" -msgstr "Montserrat" - -#: ../data/countries.h:138 -msgid "Morocco" -msgstr "Marrocos" - -#: ../data/countries.h:139 -msgid "Mozambique" -msgstr "Moçambique" - -#: ../data/countries.h:140 -msgid "Myanmar" -msgstr "Myanmar" - -#: ../data/countries.h:141 -msgid "Namibia" -msgstr "Namíbia" - -#: ../data/countries.h:142 -#: ../data/languages.h:113 -msgid "Nauru" -msgstr "Nauru" - -#: ../data/countries.h:143 -msgid "Nepal" -msgstr "Nepal" - -#: ../data/countries.h:144 -msgid "Netherlands" -msgstr "Holanda" - -#: ../data/countries.h:145 -msgid "Netherlands Antilles" -msgstr "Antilhas Holandesas" - -#: ../data/countries.h:146 -msgid "New Caledonia" -msgstr "Nova Caledônia" - -#: ../data/countries.h:147 -msgid "New Zealand" -msgstr "Nova Zelândia" - -#: ../data/countries.h:148 -msgid "Nicaragua" -msgstr "Nicarágua" - -#: ../data/countries.h:149 -msgid "Niger" -msgstr "Níger" - -#: ../data/countries.h:150 -msgid "Nigeria" -msgstr "Nigéria" - -#: ../data/countries.h:151 -msgid "Niue" -msgstr "Niue" - -#: ../data/countries.h:152 -msgid "Norfolk Island" -msgstr "Ilha Norfolk" - -#: ../data/countries.h:153 -msgid "Northern Mariana Islands" -msgstr "Ilhas Marianas do Norte" - -#: ../data/countries.h:154 -msgid "Norway" -msgstr "Noruega" - -#: ../data/countries.h:155 -msgid "Occupied Palestinian Territory" -msgstr "Território Palestino Ocupado" - -#: ../data/countries.h:156 -msgid "Oman" -msgstr "Omã" - -#: ../data/countries.h:157 -msgid "Pakistan" -msgstr "Paquistão" - -#: ../data/countries.h:158 -msgid "Palau" -msgstr "Palau" - -#: ../data/countries.h:159 -msgid "Panama" -msgstr "Panamá" - -#: ../data/countries.h:160 -msgid "Papua New Guinea" -msgstr "Papua-Nova Guiné" - -#: ../data/countries.h:161 -msgid "Paraguay" -msgstr "Paraguai" - -#: ../data/countries.h:162 -msgid "Peru" -msgstr "Peru" - -#: ../data/countries.h:163 -msgid "Philippines" -msgstr "Filipinas" - -#: ../data/countries.h:164 -msgid "Pitcairn" -msgstr "PitCairn" - -#: ../data/countries.h:165 -msgid "Poland" -msgstr "Polônia" - -#: ../data/countries.h:166 -msgid "Portugal" -msgstr "Portugal" - -#: ../data/countries.h:167 -msgid "Puerto Rico" -msgstr "Porto Rico" - -#: ../data/countries.h:168 -msgid "Qatar" -msgstr "Qatar" - -#: ../data/countries.h:169 -msgid "Republic of Korea" -msgstr "República da Coréia" - -#: ../data/countries.h:170 -msgid "Republic of Moldova" -msgstr "República de Móldova" - -#: ../data/countries.h:171 -msgid "Réunion" -msgstr "Réunion" - -#: ../data/countries.h:172 -msgid "Romania" -msgstr "Romênia" - -#: ../data/countries.h:173 -msgid "Russian Federation" -msgstr "Federação Russa" - -#: ../data/countries.h:174 -msgid "Rwanda" -msgstr "Ruanda" - -#: ../data/countries.h:175 -msgid "Saint Helena" -msgstr "Santa Helena" - -#: ../data/countries.h:176 -msgid "Saint Kitts and Nevis" -msgstr "São Kitts e Nevis" -#: ../data/countries.h:177 -msgid "Saint Lucia" -msgstr "Santa Lúcia" +#: ../data/SoftwareProperties.glade.h:11 +msgid "Restore _Defaults" +msgstr "Restaurar Pa_drões" -#: ../data/countries.h:178 -msgid "Saint Pierre and Miquelon" -msgstr "Saint Pierre e Miquelon" +#: ../data/SoftwareProperties.glade.h:12 +msgid "Restore the default keys of your distribution" +msgstr "Restaurar as chaves padrão da sua distribuição" -#: ../data/countries.h:179 -msgid "Saint Vincent and the Grenadines" -msgstr "São Vicente e os Grenadinos" +#: ../data/SoftwareProperties.glade.h:13 +msgid "Software Preferences" +msgstr "Preferências de Programas" -#: ../data/countries.h:180 -msgid "Samoa" -msgstr "Samoa" +#: ../data/SoftwareProperties.glade.h:14 +msgid "_Check for updates automatically:" +msgstr "Verifi_car por atualizações automaticamente:" -#: ../data/countries.h:181 -msgid "San Marino" -msgstr "San Marino" +#: ../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/countries.h:182 -msgid "Sao Tome and Principe" -msgstr "São Tomé e Príncipe" +#: ../data/SoftwareProperties.glade.h:16 +#, fuzzy +msgid "_Install security updates without confirmation" +msgstr "_Instalar novas atualizações sem confirmação" -#: ../data/countries.h:183 -msgid "Saudi Arabia" -msgstr "Arábia Saudita" +#: ../SoftwareProperties/SoftwareProperties.py:101 +#, python-format +msgid "Every %s days" +msgstr "A cada %s dias" -#: ../data/countries.h:184 -msgid "Senegal" -msgstr "Senegal" +#: ../SoftwareProperties/SoftwareProperties.py:131 +#, python-format +msgid "After %s days" +msgstr "Após %s dias" -#: ../data/countries.h:185 -msgid "Serbia and Montenegro" -msgstr "Sérbia e Montenegro" +#: ../SoftwareProperties/SoftwareProperties.py:354 +msgid "Import key" +msgstr "Importar Chave" -#: ../data/countries.h:186 -msgid "Seychelles" -msgstr "SayChelles" +#: ../SoftwareProperties/SoftwareProperties.py:364 +msgid "Error importing selected file" +msgstr "Erro importando o arquivo selecionado" -#: ../data/countries.h:187 -msgid "Sierra Leone" -msgstr "Serra Leoa" - -#: ../data/countries.h:188 -msgid "Singapore" -msgstr "Singapura" - -#: ../data/countries.h:189 -msgid "Slovakia" -msgstr "Eslováquia" - -#: ../data/countries.h:190 -msgid "Slovenia" -msgstr "Eslovênia" - -#: ../data/countries.h:191 -msgid "Solomon Islands" -msgstr "Ilhas Salomão" - -#: ../data/countries.h:192 -msgid "Somalia" -msgstr "Somália" - -#: ../data/countries.h:193 -msgid "South Africa" -msgstr "África do Sul" - -#: ../data/countries.h:194 -msgid "Spain" -msgstr "Espanha" - -#: ../data/countries.h:195 -msgid "Sri Lanka" -msgstr "Sri Lanka" - -#: ../data/countries.h:196 -msgid "Sudan" -msgstr "Sudão" - -#: ../data/countries.h:197 -msgid "Suriname" -msgstr "Suriname" - -#: ../data/countries.h:198 -msgid "Svalbard and Jan Mayen Islands" -msgstr "Ilhas Svalbard e Jan Mayen" - -#: ../data/countries.h:199 -msgid "Swaziland" -msgstr "Suazilândia" - -#: ../data/countries.h:200 -msgid "Sweden" -msgstr "Suécia" - -#: ../data/countries.h:201 -msgid "Switzerland" -msgstr "Suíça" - -#: ../data/countries.h:202 -msgid "Syrian Arab Republic" -msgstr "República Arábica da Síria" - -#: ../data/countries.h:203 -msgid "Tajikistan" -msgstr "Tadjiquistão" - -#: ../data/countries.h:204 -msgid "Thailand" -msgstr "Tailândia" - -#: ../data/countries.h:205 -msgid "Macedonia, Republic of" -msgstr "Macedônia, República da" - -#: ../data/countries.h:206 -msgid "Timor-Leste" -msgstr "Timor-Leste" - -#: ../data/countries.h:207 -msgid "Togo" -msgstr "Togo" - -#: ../data/countries.h:208 -msgid "Tokelau" -msgstr "Tokelau" - -#: ../data/countries.h:209 -#: ../data/languages.h:166 -msgid "Tonga" -msgstr "Tonga" - -#: ../data/countries.h:210 -msgid "Trinidad and Tobago" -msgstr "Trinidad e Tobago" - -#: ../data/countries.h:211 -msgid "Tunisia" -msgstr "Tunísia" - -#: ../data/countries.h:212 -msgid "Turkey" -msgstr "Turquia" - -#: ../data/countries.h:213 -msgid "Turkmenistan" -msgstr "Turcomenistão" - -#: ../data/countries.h:214 -msgid "Turks and Caicos Islands" -msgstr "Ilhas Turks e Caicos" - -#: ../data/countries.h:215 -msgid "Tuvalu" -msgstr "Tuvalu" - -#: ../data/countries.h:216 -msgid "Uganda" -msgstr "Uganda" - -#: ../data/countries.h:217 -msgid "Ukraine" -msgstr "Ucrânia" - -#: ../data/countries.h:218 -msgid "United Arab Emirates" -msgstr "Emirados Árabes Unidos" - -#: ../data/countries.h:219 -msgid "United Kingdom of Great Britain and Northern Ireland" -msgstr "Reindo Unido da Grã-Bretanha e Irlanda do Norte" - -#: ../data/countries.h:220 -msgid "United Republic of Tanzania" -msgstr "República Unida da Tanzânia" - -#: ../data/countries.h:221 -msgid "United States of America" -msgstr "Estados Unidosda América" - -#: ../data/countries.h:222 -msgid "United States Virgin Islands" -msgstr "Ilhas Virgens dos Estados Unidos" - -#: ../data/countries.h:223 -msgid "Uruguay" -msgstr "Uruguai" - -#: ../data/countries.h:224 -msgid "Uzbekistan" -msgstr "Uzbequistão" - -#: ../data/countries.h:225 -msgid "Vanuatu" -msgstr "Vanuatu" - -#: ../data/countries.h:226 -msgid "Venezuela" -msgstr "Venezuela" - -#: ../data/countries.h:227 -msgid "Viet Nam" -msgstr "Vietnã" - -#: ../data/countries.h:228 -msgid "Wallis and Futuna Islands" -msgstr "Ilhas Wallis e Futuna" - -#: ../data/countries.h:229 -msgid "Western Sahara" -msgstr "Saara Ocidental" - -#: ../data/countries.h:230 -msgid "Yemen" -msgstr "Iêmen" - -#: ../data/countries.h:231 -msgid "Zambia" -msgstr "Zãmbia" - -#: ../data/countries.h:232 -msgid "Zimbabwe" -msgstr "Zimbábue" - -#: ../data/countries.h:233 -msgid "Antarctica" -msgstr "Antártica" - -#: ../data/countries.h:234 -msgid "Bouvet Island" -msgstr "Ilha Bouvet" - -#: ../data/countries.h:235 -msgid "British Indian Ocean Territory" -msgstr "Território Britânico do Oceano Índico" - -#: ../data/countries.h:236 -msgid "Christmas Island" -msgstr "Ilhas Christmas" - -#: ../data/countries.h:237 -msgid "Cocos (Keeling) Islands" -msgstr "Ilha Cocos" - -#: ../data/countries.h:238 -msgid "French Southern Territories" -msgstr "Territórios Franceses do Sul" - -#: ../data/countries.h:239 -msgid "Heard Island and McDonald Islands" -msgstr "Ilha de Heard e Ilhas MacDonald" - -#: ../data/countries.h:240 -msgid "South Georgia and the South Sandwich Islands" -msgstr "Geórgia do Sul e Ilhas Sandwich do Sul" - -#: ../data/countries.h:241 -msgid "Taiwan" -msgstr "Taiwan" - -#: ../data/countries.h:242 -msgid "United States Minor Outlying Islands" -msgstr "Ilhas Menores Afastadas dos Estados Unidos" - -#: ../data/languages.h:2 -msgid "Afar" -msgstr "Afar" - -#: ../data/languages.h:3 -msgid "Abkhazian" -msgstr "Abkhazian" - -#: ../data/languages.h:4 -msgid "Avestan" -msgstr "Avestan" - -#: ../data/languages.h:5 -msgid "Afrikaans" -msgstr "Africâner" - -#: ../data/languages.h:6 -msgid "Akan" -msgstr "Akan" - -#: ../data/languages.h:7 -msgid "Amharic" -msgstr "Amaraico" - -#: ../data/languages.h:8 -msgid "Aragonese" -msgstr "Aragonês" - -#: ../data/languages.h:9 -msgid "Arabic" -msgstr "Árabe" - -#: ../data/languages.h:10 -msgid "Assamese" -msgstr "Assamês" - -#: ../data/languages.h:11 -msgid "Asturian" -msgstr "Asturian" - -#: ../data/languages.h:12 -msgid "Avaric" -msgstr "Avaric" - -#: ../data/languages.h:13 -msgid "Aymara" -msgstr "Aymara" - -#: ../data/languages.h:14 -msgid "Azerbaijani" -msgstr "Azerbaidjani" - -#: ../data/languages.h:15 -msgid "Bashkir" -msgstr "Bashkir" - -#: ../data/languages.h:16 -msgid "Byelorussian" -msgstr "Bielorusso" - -#: ../data/languages.h:17 -msgid "Bulgarian" -msgstr "Búlgaro" - -#: ../data/languages.h:18 -msgid "Bihari" -msgstr "Bihari" - -#: ../data/languages.h:19 -msgid "Bislama" -msgstr "Bislama" - -#: ../data/languages.h:20 -msgid "Bambara" -msgstr "Bambara" - -#: ../data/languages.h:21 -msgid "Bengali; Bangla" -msgstr "Bengali; Bangla" - -#: ../data/languages.h:22 -msgid "Tibetan" -msgstr "Tibetano" - -#: ../data/languages.h:23 -msgid "Breton" -msgstr "Bretão" - -#: ../data/languages.h:24 -msgid "Bosnian" -msgstr "Bósnio" - -#: ../data/languages.h:25 -msgid "Catalan" -msgstr "Catalão" - -#: ../data/languages.h:26 -msgid "Chechen" -msgstr "Checheno" - -#: ../data/languages.h:27 -msgid "Chamorro" -msgstr "Chamorro" - -#: ../data/languages.h:28 -msgid "Corsican" -msgstr "Corso" - -#: ../data/languages.h:29 -msgid "Cree" -msgstr "Cree" - -#: ../data/languages.h:30 -msgid "Czech" -msgstr "Tcheco" - -#: ../data/languages.h:31 -msgid "Old Church Slavonic" -msgstr "Old Church Slavonic" - -#: ../data/languages.h:32 -msgid "Chuvash" -msgstr "Chuvash" - -#: ../data/languages.h:33 -msgid "Welsh" -msgstr "Galês" - -#: ../data/languages.h:34 -msgid "Danish" -msgstr "Dinamarquês" - -#: ../data/languages.h:35 -msgid "German" -msgstr "Alemão" - -#: ../data/languages.h:36 -msgid "Divehi" -msgstr "Divehi" - -#: ../data/languages.h:37 -msgid "Dzongkha" -msgstr "Dzongkha" - -#: ../data/languages.h:38 -msgid "Ewe" -msgstr "Ewe" - -#: ../data/languages.h:39 -msgid "Greek, Modern" -msgstr "Grego, Moderno" - -#: ../data/languages.h:40 -msgid "English" -msgstr "Inglês" - -#: ../data/languages.h:41 -msgid "Esperanto" -msgstr "Esperanto" - -#: ../data/languages.h:42 -msgid "Spanish" -msgstr "Espanhol" +#: ../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." -#: ../data/languages.h:43 -msgid "Estonian" -msgstr "Estoniano" +#: ../SoftwareProperties/SoftwareProperties.py:377 +msgid "Error removing the key" +msgstr "Erro removendo a chave" -#: ../data/languages.h:44 -msgid "Basque" -msgstr "Basco" +#: ../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." -#: ../data/languages.h:45 -msgid "Persian" -msgstr "Persa" +#: ../SoftwareProperties/SoftwareProperties.py:421 +#, python-format +msgid "" +"<big><b>Error scaning the CD</b></big>\n" +"\n" +"%s" +msgstr "" +"<big><b>Erro analisando o CD</b></big>\n" +"\n" +"%s" -#: ../data/languages.h:46 -msgid "Fulah" -msgstr "Fulah" +#: ../SoftwareProperties/SoftwareProperties.py:471 +msgid "Please enter a name for the disc" +msgstr "Por favor digite um nome para o disco" -#: ../data/languages.h:47 -msgid "Finnish" -msgstr "Finlandês" +#: ../SoftwareProperties/SoftwareProperties.py:487 +msgid "Please insert a disc in the drive:" +msgstr "Por favor insira um disco no drive:" -#: ../data/languages.h:49 -msgid "Faroese" -msgstr "Faroês" +#: ../DistUpgrade/DistUpgradeCache.py:92 +msgid "Broken packages" +msgstr "Pacotes quebrados" -#: ../data/languages.h:50 -msgid "French" -msgstr "Francês" +#: ../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." -#: ../data/languages.h:51 -msgid "Frisian" -msgstr "Frisão" +#: ../DistUpgrade/DistUpgradeCache.py:135 +msgid "Can't upgrade required meta-packages" +msgstr "Não foi possível atualizar os meta-pacotes requeridos" -#: ../data/languages.h:52 -msgid "Irish" -msgstr "Irlandês" +#: ../DistUpgrade/DistUpgradeCache.py:142 +msgid "A essential package would have to be removed" +msgstr "Um pacote essencial teria que ser removido" -#: ../data/languages.h:53 -msgid "Scots Gaelic" -msgstr "Galês Escocês" +#. FIXME: change the text to something more useful +#: ../DistUpgrade/DistUpgradeCache.py:145 +msgid "Could not calculate the upgrade" +msgstr "Não foi possível calcular a atualização" -#: ../data/languages.h:54 -msgid "Galician" -msgstr "Galego" +#: ../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." -#: ../data/languages.h:55 -msgid "Guarani" -msgstr "Guarani" +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:168 +msgid "Error authenticating some packages" +msgstr "Erro autenticando alguns pacotes" -#: ../data/languages.h:56 -msgid "Gujarati" -msgstr "Gujarati" +#: ../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." -#: ../data/languages.h:57 -msgid "Manx" -msgstr "Manx" +#: ../DistUpgrade/DistUpgradeCache.py:232 +#, python-format +msgid "Can't install '%s'" +msgstr "Não foi possível instalar '%s'" -#: ../data/languages.h:58 -msgid "Hausa" -msgstr "Hausa" +#: ../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." -#: ../data/languages.h:59 -msgid "Hebrew" -msgstr "Hebraico" +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:240 +msgid "Can't guess meta-package" +msgstr "Não foi possível adivinhar o meta-pacote" -#: ../data/languages.h:60 -msgid "Hindi" -msgstr "Hindu" +#: ../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." +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." + +#: ../DistUpgrade/DistUpgradeControler.py:42 +msgid "Reading cache" +msgstr "Lendo cache" + +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:107 +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" -#: ../data/languages.h:61 -msgid "Hiri Motu" -msgstr "Hiri Motu" +#: ../DistUpgrade/DistUpgradeControler.py:125 +msgid "Repository information invalid" +msgstr "Informação de repositório inválida" -#: ../data/languages.h:62 -msgid "Croatian" -msgstr "Croata" +#: ../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." -#: ../data/languages.h:63 -msgid "Hungarian" -msgstr "Húngaro" +#: ../DistUpgrade/DistUpgradeControler.py:171 +msgid "Error during update" +msgstr "Erro durante a atualização" -#: ../data/languages.h:64 -msgid "Armenian" -msgstr "Armênio" +#: ../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." -#: ../data/languages.h:65 -msgid "Herero" -msgstr "Herero" +#: ../DistUpgrade/DistUpgradeControler.py:191 +#, fuzzy +msgid "Not enough free disk space" +msgstr "Espaço em disco insuficiente" -#: ../data/languages.h:66 -msgid "Interlingua" -msgstr "Interlíngua" +#: ../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 "" -#: ../data/languages.h:67 -msgid "Indonesian" -msgstr "Indonésio" +#: ../DistUpgrade/DistUpgradeControler.py:198 +#, fuzzy +msgid "Do you want to start the upgrade?" +msgstr "Não foi possível calcular a atualização" -#: ../data/languages.h:68 -msgid "Interlingue" -msgstr "Interlíngua" +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:214 +#, fuzzy +msgid "Could not install the upgrades" +msgstr "Não foi possível calcular a atualização" -#: ../data/languages.h:69 -msgid "Igbo" -msgstr "Igbo" +#: ../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." -#: ../data/languages.h:70 -msgid "Sichuan Yi" -msgstr "Sichuan Yi" +#: ../DistUpgrade/DistUpgradeControler.py:230 +#, fuzzy +msgid "Could not download the upgrades" +msgstr "Não foi possível calcular a atualização" -#: ../data/languages.h:71 -msgid "Inupiak" -msgstr "Inupiak" +#: ../DistUpgrade/DistUpgradeControler.py:231 +msgid "" +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " +msgstr "" -#: ../data/languages.h:72 -msgid "Ido" -msgstr "Ido" +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "Remove obsolete Packages?" +msgstr "Remover Pacotes obsoletos?" -#: ../data/languages.h:73 -msgid "Icelandic" -msgstr "Islandês" +#: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "Erro ao aplicar as mudanças" -#: ../data/languages.h:74 -msgid "Italian" -msgstr "Italiano" +#: ../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:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 +msgid "Checking package manager" +msgstr "Verificando o Gerenciador de Pacotes" + +#: ../DistUpgrade/DistUpgradeControler.py:311 +msgid "Updating repository information" +msgstr "Atualizando informação do repositório" + +#: ../DistUpgrade/DistUpgradeControler.py:325 +msgid "Asking for confirmation" +msgstr "Pedindi por confirmação" + +#: ../DistUpgrade/DistUpgradeControler.py:329 +msgid "Upgrading" +msgstr "Atualizando" + +#: ../DistUpgrade/DistUpgradeControler.py:336 +msgid "Searching for obsolete software" +msgstr "Buscando programas obsoletos" + +#: ../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:77 +#, python-format +msgid "Please insert '%s' into the drive '%s'" +msgstr "Por favor insira '%s' no drive '%s'" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +msgid "Download is complete" +msgstr "O Download está completo" + +#: ../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:107 +#, python-format +msgid "%s remaining" +msgstr "Faltam %s" + +#: ../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:134 +msgid "Installing updates" +msgstr "Instalando Atualizações" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 +#, python-format +msgid "Could not install '%s'" +msgstr "Não foi possível instalar '%s'" + +#: ../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:226 +msgid "A fatal error occured" +msgstr "Ocorreu um erro fatal" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 +#, fuzzy +msgid "" +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " +msgstr "" +"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: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: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 "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 "You have to download a total of %s." +msgstr "" -#: ../data/languages.h:75 -msgid "Inuktitut" -msgstr "Inuktitut" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, fuzzy, python-format +msgid "<b>Remove %s</b>" +msgstr "<b>A serem removidos: %s </b>" -#: ../data/languages.h:76 -msgid "Japanese" -msgstr "Japonês" +#: ../DistUpgrade/DistUpgradeViewGtk.py:341 +#, fuzzy, python-format +msgid "Install %s" +msgstr "_Instalar Atualizações" -#: ../data/languages.h:77 -msgid "Javanese" -msgstr "Javanês" +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, fuzzy, python-format +msgid "Upgrade %s" +msgstr "At_ualizar" -#: ../data/languages.h:78 -msgid "Georgian" -msgstr "Georgiano" +#: ../DistUpgrade/DistUpgradeView.py:67 +msgid "Reboot required" +msgstr "Reinicialização requerida" -#: ../data/languages.h:79 -msgid "Kongo" -msgstr "Kongo" +#: ../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?" + +#. testcode to see if the bullets look nice in the dialog +#. for i in range(4): +#. view.setStep(i+1) +#. app.openCache() +#: ../DistUpgrade/DistUpgrade.glade.h:1 +msgid " " +msgstr " " -#: ../data/languages.h:80 -msgid "Kikuyu" -msgstr "Kikuyu" +#: ../DistUpgrade/DistUpgrade.glade.h:2 +msgid "" +"<b><big>Cancel the running upgrade?</big></b>\n" +"\n" +"The system could be in an unusable state if you cancel the upgrade. You are " +"strongly adviced to resume the upgrade." +msgstr "" -#: ../data/languages.h:81 -msgid "Kuanyama" -msgstr "Kuanyama" +#: ../DistUpgrade/DistUpgrade.glade.h:5 +msgid "<b><big>Restart the system to complete the upgrade</big></b>" +msgstr "<b><big>Reinicie o seu sistema para finalizar a atualização</big></b>" -#: ../data/languages.h:82 -msgid "Kazakh" -msgstr "Kazakh" +#: ../DistUpgrade/DistUpgrade.glade.h:6 +msgid "<b><big>Start the upgrade?</big></b>" +msgstr "<b><big>Iniciar a Atualização?</big></b>" -#: ../data/languages.h:83 -msgid "Greenlandic" -msgstr "Groenlandês" +#: ../DistUpgrade/DistUpgrade.glade.h:7 +msgid "" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" +"span>" +msgstr "" +"<span weight=\"bold\" size=\"x-large\">Atualizando para o Ubuntu \"Dapper\" " +"6.04</span>" -#: ../data/languages.h:84 -msgid "Khmer" -msgstr "Khmer" +#: ../DistUpgrade/DistUpgrade.glade.h:8 +msgid "Cleaning up" +msgstr "Limpando" -#: ../data/languages.h:85 -msgid "Kannada" -msgstr "Kannada" +#: ../DistUpgrade/DistUpgrade.glade.h:9 +msgid "Details" +msgstr "Detalhes" -#: ../data/languages.h:86 -msgid "Korean" -msgstr "Coreano" +#: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Downloading and installing the upgrades" +msgstr "Obtendo e instalando as atualizações" -#: ../data/languages.h:87 -msgid "Kanuri" -msgstr "Kanuri" +#: ../DistUpgrade/DistUpgrade.glade.h:11 +#, fuzzy +msgid "Modifying the software channels" +msgstr "Modificando os canais de programas" -#: ../data/languages.h:88 -msgid "Kashmiri" -msgstr "Kashmiri" +#: ../DistUpgrade/DistUpgrade.glade.h:12 +msgid "Preparing the upgrade" +msgstr "Preparando a Atualização" -#: ../data/languages.h:89 -msgid "Kurdish" -msgstr "Curdo" +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" -#: ../data/languages.h:90 -msgid "Komi" -msgstr "Komi" +#: ../DistUpgrade/DistUpgrade.glade.h:14 +msgid "Terminal" +msgstr "Terminal" -#: ../data/languages.h:91 -msgid "Cornish" -msgstr "Cornish" +#: ../DistUpgrade/DistUpgrade.glade.h:15 +msgid "Upgrading Ubuntu" +msgstr "Atualizando o Ubuntu" -#: ../data/languages.h:92 -msgid "Kirghiz" -msgstr "Kirghiz" +#: ../DistUpgrade/DistUpgrade.glade.h:16 +msgid "_Report Bug" +msgstr "Reportar _Erro" -#: ../data/languages.h:93 -msgid "Latin" -msgstr "Latim" +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Restart Now" +msgstr "_Reiniciar Agora" -#: ../data/languages.h:94 -msgid "Luxembourgish" -msgstr "Luxemburguês" +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Resume Upgrade" +msgstr "Realizar a Atualização?" -#: ../data/languages.h:95 -msgid "Ganda" -msgstr "Ganda" +#: ../data/UpdateManager.glade.h:1 +msgid "" +"<b><big>You need to manually reload the latest information about updates</" +"big></b>\n" +"\n" +"Your system does not check for updates automatically. You can configure this " +"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +msgstr "" +"<b><big>Você precisa recarregar manualmente as últimas informações sobre " +"atualizações</big></b>\n" +"\n" +"O seu sistema não verifica automaticamente por atualizações. Você pode " +"configurar esse comportamento em \"Sistema\" -> \"Administração\" -> " +"\"Propriedades de Programas\"." -#: ../data/languages.h:96 -msgid "Limburgan" -msgstr "Limburgan" +#: ../data/UpdateManager.glade.h:4 +msgid "" +"<big><b>Checking for available updates</b></big>\n" +"\n" +"Software updates can correct errors, eliminate security vulnerabilities, and " +"provide new features to you." +msgstr "" +"<big><b>Verificando as Atualizações Disponíveis</b></big>\n" +"\n" +"Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades de " +"segurança, e prover novas funcionalidades para você." -#: ../data/languages.h:97 -msgid "Lingala" -msgstr "Lingala" +#: ../data/UpdateManager.glade.h:7 +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Manter o Sistema Atualizado</b></big>" -#: ../data/languages.h:98 -msgid "Lao" -msgstr "Lao" +#: ../data/UpdateManager.glade.h:8 +msgid "" +"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n" +"\n" +"Need to get the changes from the central server" +msgstr "" +"<span weight=\"bold\" size=\"larger\">Obtendo Mudanças</span>\n" +"\n" +"É necessário obter as mudanças do servidor central" -#: ../data/languages.h:99 -msgid "Lithuanian" -msgstr "Lituano" +#: ../data/UpdateManager.glade.h:11 +msgid "Cancel _Download" +msgstr "Cancelar _Download" -#: ../data/languages.h:100 -msgid "Luba-Katanga" -msgstr "Luba-Katanga" +#: ../data/UpdateManager.glade.h:12 +msgid "Changes" +msgstr "Mudanças" -#: ../data/languages.h:101 -msgid "Latvian" -msgstr "Letão" +#: ../data/UpdateManager.glade.h:13 +msgid "Description" +msgstr "Descrição" -#: ../data/languages.h:102 -msgid "Malagasy" -msgstr "Malaguês" +#: ../data/UpdateManager.glade.h:14 +msgid "Release Notes" +msgstr "Notas de Versão" -#: ../data/languages.h:103 -msgid "Marshallese" -msgstr "Marshallese" +#: ../data/UpdateManager.glade.h:15 +msgid "Reload the latest information about updates" +msgstr "Recarregar as últimas informações sobre atualizações" -#: ../data/languages.h:104 -msgid "Maori" -msgstr "Maori" +#: ../data/UpdateManager.glade.h:16 +msgid "Show details" +msgstr "Exibir Detalhes" -#: ../data/languages.h:105 -msgid "Macedonian" -msgstr "Macedônio" +#: ../data/UpdateManager.glade.h:17 +msgid "Show progress of single files" +msgstr "Exibir progresso de arquivos únicos" -#: ../data/languages.h:106 -msgid "Malayalam" -msgstr "Malaiala" +#: ../data/UpdateManager.glade.h:18 +msgid "Software Updates" +msgstr "Atualizações de Programas" -#: ../data/languages.h:107 -msgid "Mongolian" -msgstr "Mongol" +#: ../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ê." + +#: ../data/UpdateManager.glade.h:20 +msgid "U_pgrade" +msgstr "At_ualizar" + +#: ../data/UpdateManager.glade.h:21 +msgid "Upgrade to the latest version of Ubuntu" +msgstr "Atualizar para a última versão do Ubuntu" + +#: ../data/UpdateManager.glade.h:22 +msgid "_Install Updates" +msgstr "_Instalar Atualizações" + +#: ../data/UpdateManager.glade.h:23 +msgid "_Reload" +msgstr "_Recarregar" + +#: ../data/update-manager.desktop.in.h:1 +msgid "Show available updates and choose which to install" +msgstr "Exibir atualizações disponíveis e escolher quais instalar" + +#: ../data/update-manager.desktop.in.h:2 +msgid "Update Manager" +msgstr "Gerenciador de Atualizações" + +#. ChangelogURI +#: ../channels/Ubuntu.info.in.h:4 +#, no-c-format +msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" + +#. Description +#: ../channels/Ubuntu.info.in:6 +msgid "Ubuntu 6.04 \"Dapper Drake\"" +msgstr "Ubuntu 6.04 \"Dapper Drake\"" + +#. Description +#: ../channels/Ubuntu.info.in:23 +msgid "Ubuntu 5.10 \"Breezy Badger\"" +msgstr "Ubuntu 5.10 \"Breezy Badger\"" + +#. Description +#: ../channels/Ubuntu.info.in:40 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Atualizações de Segurança do Ubuntu 5.10" + +#. Description +#: ../channels/Ubuntu.info.in:57 +msgid "Ubuntu 5.10 Updates" +msgstr "Atualizações do Ubuntu 5.10" + +#. Description +#: ../channels/Ubuntu.info.in:74 +msgid "Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../channels/Ubuntu.info.in:91 +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.04 Security Updates" + +#. CompDescription +#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51 +msgid "Oficially supported" +msgstr "Suportado Oficialmente" + +#. CompDescription +#: ../channels/Ubuntu.info.in:97 +msgid "Restricted copyright" +msgstr "Restrito por copyright" + +#. CompDescription +#: ../channels/Ubuntu.info.in:100 +msgid "Community maintained (Universe)" +msgstr "Mantido pela Comunidade (Universe)" + +#. CompDescription +#: ../channels/Ubuntu.info.in:103 +msgid "Non-free (Multiverse)" +msgstr "Não-livre (Multiverse)" + +#. ChangelogURI +#: ../channels/Debian.info.in.h:4 +#, no-c-format +msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" + +#. Description +#: ../channels/Debian.info.in:6 +msgid "Debian 3.1 \"Sarge\"" +msgstr "Debian 3.1 \"Sarge\"" + +#. BaseURI +#: ../channels/Debian.info.in:19 +msgid "http://security.debian.org/" +msgstr "http://security.debian.org/" + +#. Description +#: ../channels/Debian.info.in:20 +msgid "Debian 3.1 \"Sarge\" Security Updates" +msgstr "Atualizações de Segurança do Debian 3.1 \"Sarge\"" + +#. Description +#: ../channels/Debian.info.in:34 +msgid "Debian \"Etch\" (testing)" +msgstr "Debian \"Etch\" (testing)" + +#. BaseURI +#: ../channels/Debian.info.in:47 +msgid "http://http.us.debian.org/debian/" +msgstr "http://http.us.debian.org/debian/" + +#. Description +#: ../channels/Debian.info.in:48 +msgid "Debian \"Sid\" (unstable)" +msgstr "Debian \"Sid\" (unstable)" + +#. CompDescription +#: ../channels/Debian.info.in:54 +msgid "DFSG-compatible Software with Non-Free Dependencies" +msgstr "Programa compatível com a DFSG mas com dependências não-livres" + +#. CompDescription +#: ../channels/Debian.info.in:57 +msgid "Non-DFSG-compatible Software" +msgstr "Programas não compatíveis com a DFSG" -#: ../data/languages.h:108 -msgid "Moldavian" -msgstr "Moldávio" +#~ 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'" -#: ../data/languages.h:109 -msgid "Marathi" -msgstr "Marata" +#~ msgid "Error fetching the packages" +#~ msgstr "Erro ao obter os pacotes" -#: ../data/languages.h:110 -msgid "Malay" -msgstr "Malasiano" +#~ 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." -#: ../data/languages.h:111 -msgid "Maltese" -msgstr "Maltês" +#~ 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" -#: ../data/languages.h:112 -msgid "Burmese" -msgstr "Birmanês" +#~ msgid "To be installed: %s" +#~ msgstr "A serem instalados: %s" -#: ../data/languages.h:114 -msgid "Norwegian Bokmal" -msgstr "Norueguês Bokmal" +#~ msgid "To be upgraded: %s" +#~ msgstr "A serem atualizados: %s" -#: ../data/languages.h:115 -msgid "North Ndebele" -msgstr "Ndebele, North" +#~ msgid "Are you sure you want cancel?" +#~ msgstr "Tem certeza que deseja cancelar?" -#: ../data/languages.h:116 -msgid "Nepali" -msgstr "Nepalês" +#~ 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." -#: ../data/languages.h:117 -msgid "Ndonga" -msgstr "Ndonga" +#, fuzzy +#~ msgid "<b>Sources</b>" +#~ msgstr "<b>Software Sources</b>" -#: ../data/languages.h:118 -msgid "Dutch" -msgstr "Holandês" +#, fuzzy +#~ msgid "Automatically check for updates" +#~ msgstr "Automatically check for software _updates." -#: ../data/languages.h:119 -msgid "Norwegian Nynorsk" -msgstr "Norueguês Nynorsk" +#, fuzzy +#~ msgid "Cancel downloading of the changelog" +#~ msgstr "Cancel downloading the ChangeLog" -#: ../data/languages.h:120 -msgid "Norwegian" -msgstr "Norueguês/Bokmaal" +#~ msgid "Choose a key-file" +#~ msgstr "Choose a key-file" -#: ../data/languages.h:121 -msgid "South Ndebele" -msgstr "Ndebele, South" +#~ msgid "<b>Packages to install:</b>" +#~ msgstr "<b>Packages to install:</b>" -#: ../data/languages.h:122 -msgid "Navajo" -msgstr "Navajo" +#~ msgid "" +#~ "<big><b>Available Updates</b></big>\n" +#~ "\n" +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." +#~ msgstr "" +#~ "<big><b>Available Updates</b></big>\n" +#~ "\n" +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." -#: ../data/languages.h:123 -msgid "Occitan" -msgstr "Ocitânico" +#~ msgid "<b>Comment:</b>" +#~ msgstr "<b>Comment:</b>" -#: ../data/languages.h:124 -msgid "Ojibwa" -msgstr "Ojibwa" +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Components</b>" -#: ../data/languages.h:125 -msgid "Oromo" -msgstr "Oromo" +#~ msgid "<b>Distribution:</b>" +#~ msgstr "<b>Distribution:</b>" -#: ../data/languages.h:126 -msgid "Oriya" -msgstr "Oriá" +#~ msgid "<b>Repository</b>" +#~ msgstr "<b>Repository</b>" -#: ../data/languages.h:127 -msgid "Ossetian" -msgstr "Ossétio" +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Sections:</b>" -#: ../data/languages.h:128 -msgid "Punjabi" -msgstr "Punjabi" +#~ msgid "<b>Temporary files</b>" +#~ msgstr "<b>Temporary files</b>" -#: ../data/languages.h:129 -msgid "Pali" -msgstr "Pali" +#~ msgid "<b>Type:</b>" +#~ msgstr "<b>Type:</b>" -#: ../data/languages.h:130 -msgid "Polish" -msgstr "Polonês" +#~ msgid "<b>URI:</b>" +#~ msgstr "<b>URI:</b>" -#: ../data/languages.h:131 -msgid "Pushto" -msgstr "Pushto" +#~ msgid "<b>User Interface</b>" +#~ msgstr "<b>User Interface</b>" -#: ../data/languages.h:132 -msgid "Portuguese" -msgstr "Português" +#, fuzzy +#~ msgid "" +#~ "<big><b>Authentication keys</b></big>\n" +#~ "\n" +#~ "You can add and remove authentication keys in this dialog. A key makes it " +#~ "possible to verify the integrity of the software you download." +#~ msgstr "" +#~ "<big><b>Authentication keys</b></big>\n" +#~ "\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." -#: ../data/languages.h:133 -msgid "Quechua" -msgstr "Quechua" +#~ msgid "" +#~ "<big><b>Enter the complete APT line of the repository that you want to " +#~ "add</b></big>\n" +#~ "\n" +#~ "The APT line contains the type, location and content of a repository, for " +#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a " +#~ "detailed description of the syntax in the documentation." +#~ msgstr "" +#~ "<big><b>Enter the complete APT line of the repository that you want to " +#~ "add</b></big>\n" +#~ "\n" +#~ "The APT line contains the type, location and content of a repository, for " +#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a " +#~ "detailed description of the syntax in the documentation." -#: ../data/languages.h:134 -msgid "Rhaeto-Romance" -msgstr "Raeto-Romance" +#~ msgid "APT line:" +#~ msgstr "APT line:" -#: ../data/languages.h:135 -msgid "Rundi" -msgstr "Rundi" +#~ msgid "A_uthentication" +#~ msgstr "A_uthentication" -#: ../data/languages.h:136 -msgid "Romanian" -msgstr "Romeno" +#, fuzzy +#~ msgid "" +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " +#~ 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. " -#: ../data/languages.h:137 -msgid "Russian" -msgstr "Russo" +#~ msgid "Automatically clean _temporary packages files" +#~ msgstr "Automatically clean _temporary packages files" -#: ../data/languages.h:138 -msgid "Kinyarwanda" -msgstr "Kinyarwanda" +#~ msgid "" +#~ "Binary\n" +#~ "Source" +#~ msgstr "" +#~ "Binary\n" +#~ "Source" -#: ../data/languages.h:139 -msgid "Sanskrit" -msgstr "Sânscrito" +#~ msgid "Clean interval in days: " +#~ msgstr "Clean interval in days: " -#: ../data/languages.h:140 -msgid "Sardinian" -msgstr "Sardinha" +#~ msgid "Delete _old packages in the package cache" +#~ msgstr "Delete _old packages in the package cache" -#: ../data/languages.h:141 -msgid "Sindhi" -msgstr "Sindhi" +#~ msgid "Edit Repository..." +#~ msgstr "Edit Repository..." -#: ../data/languages.h:142 -msgid "Northern Sami" -msgstr "Northern Sami" +#~ msgid "Maximum age in days:" +#~ msgstr "Maximum age in days:" -#: ../data/languages.h:143 -msgid "Sango" -msgstr "Sango" +#~ msgid "Maximum size in MB:" +#~ msgstr "Maximum size in MB:" -#: ../data/languages.h:144 -msgid "Serbo-Croatian" -msgstr "Croata (MacCroatian)" +#, fuzzy +#~ msgid "" +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." +#~ msgstr "" +#~ "Restore the default keys shiped with the distribution. This will not " +#~ "change user-installed keys." -#: ../data/languages.h:145 -msgid "Sinhalese" -msgstr "Sinhalese" +#~ msgid "Set _maximum size for the package cache" +#~ msgstr "Set _maximum size for the package cache" -#: ../data/languages.h:146 -msgid "Slovak" -msgstr "Eslovaco" +#~ msgid "Settings" +#~ msgstr "Settings" -#: ../data/languages.h:147 -msgid "Slovenian" -msgstr "Esloveno" +#~ msgid "Show disabled software sources" +#~ msgstr "Show disabled software sources" -#: ../data/languages.h:148 -msgid "Samoan" -msgstr "Samoan" +#~ msgid "Update interval in days: " +#~ msgstr "Update interval in days: " -#: ../data/languages.h:149 -msgid "Shona" -msgstr "Shona" +#~ msgid "_Add Repository" +#~ msgstr "_Add Repository" -#: ../data/languages.h:150 -msgid "Somali" -msgstr "Somali" +#~ msgid "_Custom" +#~ msgstr "_Custom" -#: ../data/languages.h:151 -msgid "Albanian" -msgstr "Albanês" +#~ msgid "_Download upgradable packages" +#~ msgstr "_Download upgradable packages" -#: ../data/languages.h:152 -msgid "Serbian" -msgstr "Sérvio" +#~ 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." -#: ../data/languages.h:153 -msgid "Swati" -msgstr "Swati" +#~ msgid "It is not possible to upgrade all packages." +#~ msgstr "It is not possible to upgrade all packages." -#: ../data/languages.h:154 -msgid "Southern Sotho" -msgstr "Sotho, Southern" +#~ msgid "" +#~ "This means that besides the actual upgrade of the packages some further " +#~ "action (such as installing or removing packages) is required. Please use " +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." +#~ msgstr "" +#~ "This means that besides the actual upgrade of the packages some further " +#~ "action (such as installing or removing packages) is required. Please use " +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." -#: ../data/languages.h:155 -msgid "Sundanese" -msgstr "Sundanese" +#~ msgid "The following packages are not upgraded: " +#~ msgstr "The following packages are not upgraded: " -#: ../data/languages.h:156 -msgid "Swedish" -msgstr "Sueco" +#~ msgid "Changes not found, the server may not be updated yet." +#~ msgstr "Changes not found, the server may not be updated yet." -#: ../data/languages.h:157 -msgid "Swahili" -msgstr "Swahili" +#~ 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." -#: ../data/languages.h:158 -msgid "Tamil" -msgstr "Tamil" +#~ msgid "Version %s: \n" +#~ msgstr "Version %s: \n" -#: ../data/languages.h:159 -msgid "Telugu" -msgstr "Telugu" +#~ msgid "Downloading changes..." +#~ msgstr "Downloading changes..." -#: ../data/languages.h:160 -msgid "Tajik" -msgstr "Taji" +#~ msgid "The updates are being applied." +#~ msgstr "The updates are being applied." -#: ../data/languages.h:161 -msgid "Thai" -msgstr "Tailandês" +#~ 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." -#: ../data/languages.h:162 -msgid "Tigrinya" -msgstr "Tigrinya" +#~ msgid "Updating package list..." +#~ msgstr "Updating package list..." -#: ../data/languages.h:163 -msgid "Turkmen" -msgstr "Turkmen" +#~ msgid "Your system is up-to-date!" +#~ msgstr "Your system is up-to-date!" -#: ../data/languages.h:164 -msgid "Tagalog" -msgstr "Tagalog" +#~ msgid "There are no updates available." +#~ msgstr "There are no updates available." -#: ../data/languages.h:165 -msgid "Tswana" -msgstr "Tswana" +#~ msgid "New version: %s" +#~ msgstr "New version: %s" -#: ../data/languages.h:167 -msgid "Turkish" -msgstr "Turco" +#~ msgid "Your distribution is no longer supported" +#~ msgstr "Your distribution is no longer supported" -#: ../data/languages.h:168 -msgid "Tsonga" -msgstr "Tsonga" +#~ 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. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." +#~ msgstr "" +#~ "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." -#: ../data/languages.h:169 -msgid "Tatar" -msgstr "Tátar" +#~ msgid "There is a new release of Ubuntu available!" +#~ msgstr "There is a new release of Ubuntu available!" -#: ../data/languages.h:170 -msgid "Twi" -msgstr "Twi" +#~ 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." -#: ../data/languages.h:171 -msgid "Tahitian" -msgstr "Taitiano" +#~ msgid "Never show this message again" +#~ msgstr "Never show this message again" -#: ../data/languages.h:172 -msgid "Uighur" -msgstr "Uighur" +#, fuzzy +#~ msgid "" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" +#~ msgstr "" +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." -#: ../data/languages.h:173 -msgid "Ukrainian" -msgstr "Ucraniano" +#~ msgid "Initializing and getting list of updates..." +#~ msgstr "Initializing and getting list of updates..." -#: ../data/languages.h:174 -msgid "Urdu" -msgstr "Urdu" +#~ msgid "You need to be root to run this program" +#~ msgstr "You need to be root to run this program" -#: ../data/languages.h:175 -msgid "Uzbek" -msgstr "Uzbeque" +#~ msgid "Edit software sources and settings" +#~ msgstr "Edit software sources and settings" -#: ../data/languages.h:176 -msgid "Venda" -msgstr "Venda" +#~ msgid "Software Properties" +#~ msgstr "Software Properties" -#: ../data/languages.h:177 -msgid "Vietnamese" -msgstr "Vietnamita" +#~ msgid "Ubuntu Update Manager" +#~ msgstr "Ubuntu Update Manager" -#: ../data/languages.h:178 -msgid "Volapuk" -msgstr "Volapuk" +#~ msgid "Binary" +#~ msgstr "Binary" -#: ../data/languages.h:179 -msgid "Walloon" -msgstr "Valão" +#~ msgid "Source" +#~ msgstr "Source" -#: ../data/languages.h:180 -msgid "Wolof" -msgstr "Wolof" +#~ msgid "CD" +#~ msgstr "CD" -#: ../data/languages.h:181 -msgid "Xhosa" -msgstr "Xhosa" +#~ msgid "Ubuntu 4.10 Security Updates" +#~ msgstr "Ubuntu 4.10 Security Updates" -#: ../data/languages.h:182 -msgid "Yiddish" -msgstr "Ídiche" +#~ msgid "Contributed software" +#~ msgstr "Contributed software" -#: ../data/languages.h:183 -msgid "Yoruba" -msgstr "Iorubá" +#~ msgid "Non-free software" +#~ msgstr "Non-free software" -#: ../data/languages.h:184 -msgid "Zhuang" -msgstr "Zhuang" +#~ msgid "US export restricted software" +#~ msgstr "US export restricted software" -#: ../data/languages.h:185 -msgid "Chinese" -msgstr "Chinês" +#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>" +#~ msgstr "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>" -#: ../data/languages.h:186 -msgid "Zulu" -msgstr "Zulu" +#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>" +#~ msgstr "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>" -#: ../data/language-selector.desktop.in.h:1 -msgid "Configure multiple and native language support on your system" -msgstr "Configure suporte a vários idiomas nativos no seu sistema" +#~ msgid "Repositories changed" +#~ msgstr "Repositories changed" -#~ msgid "Update language support?" -#~ msgstr "Atualizar suporte a idiomas?" #~ msgid "" -#~ "Some packages for full language support are not installed on your system. " -#~ "Do you want to install them now?" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" +#~ "\n" +#~ "You need to reload the package list from the servers for your changes to " +#~ "take effect. Do you want to do this now?" #~ msgstr "" -#~ "Alguns pacotes para suporte total a idiomas não estão instalados no " -#~ "sistema. Você gostaria de instalá-los agora?" -#~ msgid "Can not apply changes" -#~ msgstr "Não foi possível aplicar as mudanças" -#~ msgid "" -#~ "Some packages for full language support can't be installed on your " -#~ "system. This usually means there is something wrong in the ubuntu archive " -#~ "or with your 'apt' software settings." -#~ msgstr "" -#~ "Alguns pacotes para suporte total a idiomas não foram instalados no seu " -#~ "sistema. Isso geralmente significa que há algo errado com o repositório " -#~ "de software do ubuntu ou com suas configurações do programa 'apt'." -#~ msgid "Language selector" -#~ msgstr "Escolha do Idioma" -#~ msgid "Status:" -#~ msgstr "Status:" -#~ msgid "Input" -#~ msgstr "Entrada" -#~ msgid "" -#~ "<b>The language selector helps you install additional languages onto your " -#~ "system.</b>" -#~ msgstr "" -#~ "<b>Esta ferramente auxilia a instalação de suporte a novos idiomas no " -#~ "sistema. </b>" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" +#~ "\n" +#~ "You need to reload the package list from the servers for your changes to " +#~ "take effect. Do you want to do this now?" + +#, fuzzy #~ msgid "" -#~ "Choose 'Translation' for translated user interface and documentation.\n" -#~ "Choose 'Input' for writting aids such as spell checking." +#~ "<big><b>Available Updates</b></big>\n" +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" -#~ "Escolha 'Tradução' para tradução da interface e documentação.\n" -#~ "Escolha 'Entrada' para ferramentas de ajuda na digitação, como corretor " -#~ "ortográfico." -#~ msgid "System default:" -#~ msgstr "Padrão do sistema:" -#~ msgid "Arab Republic of Egypt" -#~ msgstr "República Arábica do Egito" -#~ msgid "Argentine Republic" -#~ msgstr "República Argentina" -#~ msgid "Bolivarian Republic of Venezuela" -#~ msgstr "República Bolivar da Venezuela" -#~ msgid "Commonwealth of Dominica" -#~ msgstr "Nação Dominicana" -#~ msgid "Commonwealth of the Bahamas" -#~ msgstr "Nação das Bahamas" -#~ msgid "Commonwealth of the Northern Mariana Islands" -#~ msgstr "Nação das Ilhas Marianas do Norte" -#~ msgid "Congo, The Democratic Republic of the" -#~ msgstr "República Democrática do Congo" -#~ msgid "Democratic Republic of Sao Tome and Principe" -#~ msgstr "República Democrática de São Tomé e Príncipe" -#~ msgid "Democratic Republic of Timor-Leste" -#~ msgstr "República Democrática do Timor-Leste" -#~ msgid "Democratic Socialist Republic of Sri Lanka" -#~ msgstr "República Democrática Popular do Sri Lanka" -#~ msgid "Eastern Republic of Uruguay" -#~ msgstr "República Oriental do Uruguai" -#~ msgid "Faroe Islands" -#~ msgstr "Ilhas Faeroes" -#~ msgid "Federal Democratic Republic of Ethiopia" -#~ msgstr "República Federal Democrática da Etiópia" -#~ msgid "Federal Republic of Germany" -#~ msgstr "República Federativa da Alemanha" -#~ msgid "Federal Republic of Nigeria" -#~ msgstr "República Federativa da Nigéria" -#~ msgid "Federated States of Micronesia" -#~ msgstr "Estados Federados da Micronésia" -#~ msgid "Federative Republic of Brazil" -#~ msgstr "República Federativa do Brasil" -#~ msgid "French Republic" -#~ msgstr "República Francesa" -#~ msgid "Gabonese Republic" -#~ msgstr "República Gabonese" -#~ msgid "Grand Duchy of Luxembourg" -#~ msgstr "Grande Ducado de Luxemburgo" -#~ msgid "Hashemite Kingdom of Jordan" -#~ msgstr "Reino Hashemite de Jordão" -#~ msgid "Hellenic Republic" -#~ msgstr "República Helénica" -#~ msgid "Holy See (Vatican City State)" -#~ msgstr "Cidade Estado do Vaticano" -#~ msgid "Hong Kong" -#~ msgstr "Hong Kong" -#~ msgid "Independent State of Samoa" -#~ msgstr "Estado Independente de Samoa" -#~ msgid "Iran, Islamic Republic of" -#~ msgstr "República Islâmica do Irã" -#~ msgid "Islamic Republic of Iran" -#~ msgstr "República Islâmica do Irã" -#~ msgid "Islamic Republic of Mauritania" -#~ msgstr "República Islâmica da Mauritânia" -#~ msgid "Islamic Republic of Pakistan" -#~ msgstr "República Islâmica do Paquistão" -#~ msgid "Italian Republic" -#~ msgstr "República Italiana" -#~ msgid "Kingdom of Belgium" -#~ msgstr "Reino da Bélgica" -#~ msgid "Kingdom of Bhutan" -#~ msgstr "Reino de Butão" -#~ msgid "Kingdom of Cambodia" -#~ msgstr "Reino de Camboja" -#~ msgid "Kingdom of Denmark" -#~ msgstr "Reino da Dinamarca" -#~ msgid "Kingdom of Lesotho" -#~ msgstr "Reino de Lesoto" -#~ msgid "Kingdom of Morocco" -#~ msgstr "Reino de Marrocos" -#~ msgid "Kingdom of Nepal" -#~ msgstr "Reino do Nepal" -#~ msgid "Kingdom of Norway" -#~ msgstr "Reino da Noruega" -#~ msgid "Kingdom of Saudi Arabia" -#~ msgstr "Reino da Arábia Saudita" -#~ msgid "Kingdom of Spain" -#~ msgstr "Reino da Espanha" -#~ msgid "Kingdom of Swaziland" -#~ msgstr "Reino da Suazilândia" -#~ msgid "Kingdom of Sweden" -#~ msgstr "Reino da Suécia" -#~ msgid "Kingdom of Thailand" -#~ msgstr "Reino da Tailândia" -#~ msgid "Kingdom of Tonga" -#~ msgstr "Reino de Tonga" -#~ msgid "Kingdom of the Netherlands" -#~ msgstr "Reino da Holanda" -#~ msgid "Korea, Democratic People's Republic of" -#~ msgstr "República Democrática Popular da Coréia" -#~ msgid "Korea, Republic of" -#~ msgstr "República da Coréia" -#~ msgid "Kyrgyz Republic" -#~ msgstr "República Quirgistã" -#~ msgid "Lebanese Republic" -#~ msgstr "República Libanesa" -#~ msgid "Macao" -#~ msgstr "Macau" -#~ msgid "Macao Special Administrative Region of China" -#~ msgstr "Macao Região Administrativa Especial da China" -#~ msgid "Micronesia, Federated States of" -#~ msgstr "Micronésia, Estados Federados da" -#~ msgid "Moldova, Republic of" -#~ msgstr "Móldova, República de" -#~ msgid "Palestinian Territory, Occupied" -#~ msgstr "Território Palestino, Ocupado" -#~ msgid "People's Democratic Republic of Algeria" -#~ msgstr "República Democrática Popular do Congo" -#~ msgid "People's Republic of Bangladesh" -#~ msgstr "República das Pessoas de Bangladesh" -#~ msgid "People's Republic of China" -#~ msgstr "República Popular da China" -#~ msgid "Portuguese Republic" -#~ msgstr "República Portuguesa" -#~ msgid "Principality of Andorra" -#~ msgstr "Principado de Andorra" -#~ msgid "Principality of Liechtenstein" -#~ msgstr "Principado de Liechtenstein" -#~ msgid "Principality of Monaco" -#~ msgstr "Principado de Mônaco" -#~ msgid "Republic of Albania" -#~ msgstr "República da Albânia" -#~ msgid "Republic of Angola" -#~ msgstr "República da Angola" -#~ msgid "Republic of Armenia" -#~ msgstr "República da Armênia" -#~ msgid "Republic of Austria" -#~ msgstr "República da Áustria" -#~ msgid "Republic of Azerbaijan" -#~ msgstr "República do Azerbaijão" -#~ msgid "Republic of Belarus" -#~ msgstr "República de Belorússia" -#~ msgid "Republic of Benin" -#~ msgstr "República de Benin" -#~ msgid "Republic of Bolivia" -#~ msgstr "República da Bolívia" -#~ msgid "Republic of Bosnia and Herzegovina" -#~ msgstr "República da Bósnia e Herzegovina" -#~ msgid "Republic of Botswana" -#~ msgstr "República de Botsuana" -#~ msgid "Republic of Bulgaria" -#~ msgstr "República da Bulgária" -#~ msgid "Republic of Burundi" -#~ msgstr "República de Burundi" -#~ msgid "Republic of Cameroon" -#~ msgstr "República de Camarões" -#~ msgid "Republic of Cape Verde" -#~ msgstr "República do Cabo Verde" -#~ msgid "Republic of Chad" -#~ msgstr "República de Tchade" -#~ msgid "Republic of Chile" -#~ msgstr "República do Chile" -#~ msgid "Republic of Colombia" -#~ msgstr "República da Colômbia" -#~ msgid "Republic of Costa Rica" -#~ msgstr "República da Costa Rica" -#~ msgid "Republic of Cote d'Ivoire" -#~ msgstr "República da Costa do Marfim" -#~ msgid "Republic of Croatia" -#~ msgstr "República da Croácia" -#~ msgid "Republic of Cuba" -#~ msgstr "República de Cuba" -#~ msgid "Republic of Cyprus" -#~ msgstr "República do Chipre" -#~ msgid "Republic of Djibouti" -#~ msgstr "República de Djibuti" -#~ msgid "Republic of Ecuador" -#~ msgstr "República do Equador" -#~ msgid "Republic of El Salvador" -#~ msgstr "República de El Salvador" -#~ msgid "Republic of Equatorial Guinea" -#~ msgstr "República da Guinéa Equatorial" -#~ msgid "Republic of Estonia" -#~ msgstr "República da Estônia" -#~ msgid "Republic of Finland" -#~ msgstr "República da Finlândia" -#~ msgid "Republic of Ghana" -#~ msgstr "República de Ghana" -#~ msgid "Republic of Guatemala" -#~ msgstr "República da Guatemala" -#~ msgid "Republic of Guinea" -#~ msgstr "República de Guiné" -#~ msgid "Republic of Guinea-Bissau" -#~ msgstr "República de Guiné-Bissau" -#~ msgid "Republic of Guyana" -#~ msgstr "República de Guiana" -#~ msgid "Republic of Haiti" -#~ msgstr "República da Coréia" -#~ msgid "Republic of Honduras" -#~ msgstr "República de Honduras" -#~ msgid "Republic of Hungary" -#~ msgstr "República da Hungria" -#~ msgid "Republic of Iceland" -#~ msgstr "República da Islândia" -#~ msgid "Republic of India" -#~ msgstr "República da Índia" -#~ msgid "Republic of Indonesia" -#~ msgstr "República da Indonésia" -#~ msgid "Republic of Iraq" -#~ msgstr "República do Iraque" -#~ msgid "Republic of Kazakhstan" -#~ msgstr "República do Casaquistão" -#~ msgid "Republic of Kenya" -#~ msgstr "República do Quênia" -#~ msgid "Republic of Kiribati" -#~ msgstr "República de Kiribati" -#~ msgid "Republic of Latvia" -#~ msgstr "República da Latvia" -#~ msgid "Republic of Liberia" -#~ msgstr "República da Libéria" -#~ msgid "Republic of Lithuania" -#~ msgstr "República da Lituânia" -#~ msgid "Republic of Madagascar" -#~ msgstr "República de Madagascar" -#~ msgid "Republic of Malawi" -#~ msgstr "República de Malawi" -#~ msgid "Republic of Maldives" -#~ msgstr "República de Maldivas" -#~ msgid "Republic of Mali" -#~ msgstr "República de Mali" -#~ msgid "Republic of Malta" -#~ msgstr "República de Malta" -#~ msgid "Republic of Mauritius" -#~ msgstr "República de Maurício" -#~ msgid "Republic of Mozambique" -#~ msgstr "República de Moçambique" -#~ msgid "Republic of Namibia" -#~ msgstr "República da Namíbia" -#~ msgid "Republic of Nauru" -#~ msgstr "República de Nauru" -#~ msgid "Republic of Nicaragua" -#~ msgstr "República da Nicarágua" -#~ msgid "Republic of Niue" -#~ msgstr "República de Niue" -#~ msgid "Republic of Palau" -#~ msgstr "República de Palau" -#~ msgid "Republic of Panama" -#~ msgstr "República do Panamá" -#~ msgid "Republic of Paraguay" -#~ msgstr "República do Paraguai" -#~ msgid "Republic of Peru" -#~ msgstr "República do Peru" -#~ msgid "Republic of Poland" -#~ msgstr "República da Polônia" -#~ msgid "Republic of San Marino" -#~ msgstr "República de San Marino" -#~ msgid "Republic of Senegal" -#~ msgstr "República do Senegal" -#~ msgid "Republic of Seychelles" -#~ msgstr "República de SayChelles" -#~ msgid "Republic of Sierra Leone" -#~ msgstr "República de Serra Leoa" -#~ msgid "Republic of Singapore" -#~ msgstr "República de Singapura" -#~ msgid "Republic of Slovenia" -#~ msgstr "República da Eslovênia" -#~ msgid "Republic of South Africa" -#~ msgstr "Repúbica da África do Sul" -#~ msgid "Republic of Suriname" -#~ msgstr "República do Suriname" -#~ msgid "Republic of Tajikistan" -#~ msgstr "República do Tadjiquistão" -#~ msgid "Republic of Trinidad and Tobago" -#~ msgstr "República de Trinidad e Tobago" -#~ msgid "Republic of Tunisia" -#~ msgstr "República da Tunísia" -#~ msgid "Republic of Turkey" -#~ msgstr "República da Turquia" -#~ msgid "Republic of Uganda" -#~ msgstr "República de Uganda" -#~ msgid "Republic of Uzbekistan" -#~ msgstr "República do Uzbequistão" -#~ msgid "Republic of Vanuatu" -#~ msgstr "República de Vanuatu" -#~ msgid "Republic of Yemen" -#~ msgstr "República do Yemen" -#~ msgid "Republic of Zambia" -#~ msgstr "República de Zãmbia" -#~ msgid "Republic of Zimbabwe" -#~ msgstr "República do Zimbábue" -#~ msgid "Republic of the Congo" -#~ msgstr "República do Congo" -#~ msgid "Republic of the Fiji Islands" -#~ msgstr "República das Ilhas Fiji" -#~ msgid "Republic of the Gambia" -#~ msgstr "República da Gâmbia" -#~ msgid "Republic of the Marshall Islands" -#~ msgstr "República das Ilhas Marshall" -#~ msgid "Republic of the Niger" -#~ msgstr "República de Níger" -#~ msgid "Republic of the Philippines" -#~ msgstr "República das Filipinas" -#~ msgid "Republic of the Sudan" -#~ msgstr "Repúlica do Sudão" -#~ msgid "Reunion" -#~ msgstr "Reunião" -#~ msgid "Rwandese Republic" -#~ msgstr "República Ruandesa" -#~ msgid "Slovak Republic" -#~ msgstr "República da Eslováquia" -#~ msgid "Socialist People's Libyan Arab Jamahiriya" -#~ msgstr "Socialismo Popular Líbio Arábico Jamahiriya" -#~ msgid "Socialist Republic of Viet Nam" -#~ msgstr "República Socialista do Vietnã" -#~ msgid "Somali Republic" -#~ msgstr "República Somali" -#~ msgid "State of Bahrain" -#~ msgstr "Estado de Bahrain" -#~ msgid "State of Israel" -#~ msgstr "Estado de Israel" -#~ msgid "State of Kuwait" -#~ msgstr "Estado do Kuait" -#~ msgid "State of Qatar" -#~ msgstr "Estado de Qatar" -#~ msgid "Sultanate of Oman" -#~ msgstr "Sultanato de Omã" -#~ msgid "Svalbard and Jan Mayen" -#~ msgstr "Svalbard e Jan Mayen" -#~ msgid "Swiss Confederation" -#~ msgstr "Confederação Suíça" -#~ msgid "Taiwan, Province of China" -#~ msgstr "Taiwan, Província da China" -#~ msgid "Tanzania, United Republic of" -#~ msgstr "Tanzânia, República Unida da" -#~ msgid "The Former Yugoslav Republic of Macedonia" -#~ msgstr "A Antiga República Iugoslava da Macedonia" -#~ msgid "The Transitional Islamic State of Afghanistan" -#~ msgstr "O Estado Islâmico Transicional do Afeganistão" -#~ msgid "Togolese Republic" -#~ msgstr "República Togolese" -#~ msgid "Union of Myanmar" -#~ msgstr "União de Myanmar" -#~ msgid "Union of the Comoros" -#~ msgstr "União de Comores" -#~ msgid "United Kingdom" -#~ msgstr "Reino Unido" -#~ msgid "United Mexican States" -#~ msgstr "Estados Unidos Mexicanos" -#~ msgid "United States" -#~ msgstr "Estados Unidos" -#~ msgid "Virgin Islands of the United States" -#~ msgstr "Ilhas Virgens dos Estados Unidos" -#~ msgid "Virgin Islands, British" -#~ msgstr "Inglesa, Ilhas Virgens" -#~ msgid "Virgin Islands, U.S." -#~ msgstr "Ilhas Virgens Americanas" -#~ msgid "Wallis and Futuna" -#~ msgstr "Wallis e Futuna" -#~ msgid "Belarusian" -#~ msgstr "Bielorusso" - +#~ "<big><b>Available Updates</b></big>\n" +#~ "\n" +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." @@ -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 <dand@gnome.ro>\n" "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Detalii</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>Detalii</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -810,10 +844,6 @@ msgstr "" #~ msgid "_Download upgradable packages" #~ msgstr "_Descarcă pachetele actualizate" -#, fuzzy -#~ msgid "Your system has broken packages!" -#~ msgstr "Sistemul dvs. este la zi!" - #~ msgid "Changes not found, the server may not be updated yet." #~ msgstr "" #~ "Nu am găsit modificări, s-ar putea ca serverul să nu fi fost actualizat." @@ -14,8 +14,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-03-31 20:55-0700\n" "Last-Translator: Steve Murphy <murf@e-tools.com>\n" "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n" @@ -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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<B B" + +# #-#-#-#-# setup2.pot (PACKAGE VERSION) #-#-#-#-# +# setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_PROG.text +# #-#-#-#-# setup2.pot (PACKAGE VERSION) #-#-#-#-# +# setup2/source\uibase\agentdlg.src:RC_AGENTDLG.RESID_DLG_AGENT_STR_INSTALL.text #: ../DistUpgrade/DistUpgradeViewGtk.py:341 -msgid "Are you sure you want cancel?" -msgstr "" +#, fuzzy, python-format +msgid "Install %s" +msgstr "Kwinjiza porogaramu" -#: ../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 "Byarangiye" #: ../DistUpgrade/DistUpgradeView.py:67 msgid "Reboot required" @@ -436,56 +457,73 @@ msgid " " msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:2 +msgid "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<B B" -#: ../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 "Byarangiye" + #: ../data/UpdateManager.glade.h:1 msgid "" "<b><big>You need to manually reload the latest information about updates</" @@ -706,6 +744,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "i Urufunguzo" + +#, fuzzy #~ msgid "<b>Sources</b>" #~ msgstr "<B B" @@ -849,10 +891,6 @@ msgstr "" #~ msgstr "Guhanga" #, fuzzy -#~ msgid "Your system has broken packages!" -#~ msgstr "Sisitemu" - -#, fuzzy #~ msgid "" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." @@ -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-26 15:14+0100\n" "Last-Translator: Christian Rose <menthos@menthos.com>\n" "Language-Team: Swedish <sv@li.org>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Detaljer</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -687,6 +723,18 @@ msgid "Non-DFSG-compatible Software" msgstr "Tillgängliga program" #, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "Inga matchande paket hittades" + +#, fuzzy +#~ msgid "To be installed: %s" +#~ msgstr "inte installerad" + +#, fuzzy +#~ msgid "Are you sure you want cancel?" +#~ msgstr "Är du säker på att du vill avsluta?" + +#, fuzzy #~ msgid "<b>Sources</b>" #~ msgstr "<b>Programvarukällor</b>" @@ -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 "<b>Details</b>" #~ msgstr "<b>Detaljer</b>" @@ -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." @@ -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 <mvd@mylinux.ua>\n" "Language-Team: Ukrainian <uk@li.org>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Клавіші</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>Подробиці</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -679,6 +715,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "Помилка видалення ключа" + #~ msgid "Edit software sources and settings" #~ msgstr "Редагування джерел програм та параметрів" @@ -836,9 +876,6 @@ msgstr "" #~ msgid "Downloading Changes" #~ msgstr "Завантаження змін" -#~ msgid "_Install" -#~ msgstr "_Встановити" - #, fuzzy #~ msgid "Debian sarge" #~ msgstr "Debian 3.1 \"Sarge\"" @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager Gnome 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-08-26 18:15+0930\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>Khóa</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>Chi tiết</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -680,6 +710,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "Gặp lỗi khi gỡ bỏ khóa" + #~ msgid "Edit software sources and settings" #~ msgstr "Sửa đổi thiết lập và nguồn phần mềm" @@ -836,9 +870,6 @@ msgstr "" #~ msgid "Downloading Changes" #~ msgstr "Đang tải các thay đổi" -#~ msgid "_Install" -#~ msgstr "_Cài đặt" - #~ msgid "You need to be root to run this program" #~ msgstr "Phải là người chủ để chạy chương trình này." @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-notifier\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 13:25+0200\n" "Last-Translator: Canonical Ltd <translations@canonical.com>\n" "Language-Team: Xhosa <xh-translate@ubuntu.com>\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 "<b>To be removed: %s</b>" +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 "<b>Remove %s</b>" 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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "" "<b><big>You need to manually reload the latest information about updates</" diff --git a/po/zh_CN.po b/po/zh_CN.po index 145621b8..93662349 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.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-03-21 22:00+0800\n" "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n" "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n" @@ -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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>细节</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>细节</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -757,9 +791,6 @@ msgstr "" #~ msgid "_Download upgradable packages" #~ msgstr "下载可更新的包(_D)" -#~ msgid "Your system has broken packages!" -#~ msgstr "您的系统有损坏的软件包！" - #~ msgid "It is not possible to upgrade all packages." #~ msgstr "无法升级全部软件包。" diff --git a/po/zh_HK.po b/po/zh_HK.po index f8e5237e..16e971bb 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\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-14 01:58+0800\n" "Last-Translator: Abel Cheung <abel@oaka.org>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>密碼匙</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>細節</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -679,6 +712,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "移除密碼匙時發生錯誤" + #~ msgid "Edit software sources and settings" #~ msgstr "修改軟件來源和設定" @@ -833,9 +870,6 @@ msgstr "" #~ msgid "Downloading Changes" #~ msgstr "正在下載更改紀錄" -#~ msgid "_Install" -#~ msgstr "安裝(_I)" - #~ msgid "You need to be root to run this program" #~ msgstr "你需要 root 的身分方可使用本程式" diff --git a/po/zh_TW.po b/po/zh_TW.po index 13624e45..f3c467c6 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\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-14 01:58+0800\n" "Last-Translator: Abel Cheung <abel@oaka.org>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 "<b>To be removed: %s</b>" -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 "<b>Remove %s</b>" +msgstr "<b>金鑰</b>" + #: ../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 "" +"<b><big>Cancel the running upgrade?</big></b>\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 "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:3 +#: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:4 +#: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</" "span>" 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 "<b>細節</b>" -#: ../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 "" "<b><big>You need to manually reload the latest information about updates</" @@ -679,6 +712,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Error fetching the packages" +#~ msgstr "移除金鑰時發生錯誤" + #~ msgid "Edit software sources and settings" #~ msgstr "修改軟體來源和設定" @@ -832,9 +869,6 @@ msgstr "" #~ msgid "Downloading Changes" #~ msgstr "正在下載更改紀錄" -#~ msgid "_Install" -#~ msgstr "安裝(_I)" - #~ msgid "You need to be root to run this program" #~ msgstr "您需要 root 的身分方可使用本程式" |