diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-01-26 16:50:22 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-01-26 16:50:22 +0100 |
| commit | 197ee7ebe6388a7697ce28225b1cb9af8df8358f (patch) | |
| tree | bc460182b1c7fb877e8b052887fcc003864482db | |
| parent | 34e95d043502c7522062d69bd019e809a53b48a2 (diff) | |
| download | python-apt-197ee7ebe6388a7697ce28225b1cb9af8df8358f.tar.gz | |
* log the removal candidates as well
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 1 | ||||
| -rw-r--r-- | po/da.po | 81 | ||||
| -rw-r--r-- | po/de.po | 82 | ||||
| -rw-r--r-- | po/el.po | 81 | ||||
| -rw-r--r-- | po/en_CA.po | 82 | ||||
| -rw-r--r-- | po/es.po | 82 | ||||
| -rw-r--r-- | po/fi.po | 82 | ||||
| -rw-r--r-- | po/fr.po | 82 | ||||
| -rw-r--r-- | po/hu.po | 82 | ||||
| -rw-r--r-- | po/ja.po | 82 | ||||
| -rw-r--r-- | po/pl.po | 82 | ||||
| -rw-r--r-- | po/pt_BR.po | 81 | ||||
| -rw-r--r-- | po/ro.po | 81 | ||||
| -rw-r--r-- | po/rw.po | 82 | ||||
| -rw-r--r-- | po/sv.po | 85 | ||||
| -rw-r--r-- | po/xh.po | 81 | ||||
| -rw-r--r-- | po/zh_CN.po | 81 |
17 files changed, 747 insertions, 563 deletions
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 062d305b..8321ce8f 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -252,6 +252,7 @@ class DistUpgradeControler(object): logging.debug("'%s' scheduled for remove but not in remove_candiates, skipping", pkgname) logging.debug("Finish checking for obsolete pkgs") changes = self.cache.getChanges() + logging.debug("The following packages are remove candidates: %s" % " ".join([pkg.name for pkg in changes])) if len(changes) > 0 and \ self._view.confirmChanges(_("Remove obsolete Packages?"), changes, 0): @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-26 13:14+0100\n" +"POT-Creation-Date: 2006-01-26 15:51+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" @@ -385,48 +385,59 @@ msgid "" "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:166 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:165 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:184 +#: ../DistUpgrade/DistUpgradeControler.py:186 msgid "Not enough free space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:185 +#: ../DistUpgrade/DistUpgradeControler.py:187 msgid "" "There is not enough free space on your system to download the required " "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " "clean'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 +#: ../DistUpgrade/DistUpgradeControler.py:192 #, fuzzy msgid "Perform Upgrade?" msgstr "Opgradering færdig" -#: ../DistUpgrade/DistUpgradeControler.py:200 -#: ../DistUpgrade/DistUpgradeControler.py:238 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:263 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:201 +#: ../DistUpgrade/DistUpgradeControler.py:207 msgid "" -"Some problem occured during the upgrade. This is mostly a network problem, " -"please check the network and try again. " +"Some problem occured during the upgrade. Most likely packages failed to " +"install. Try 'sudo apt-get install -f' or synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:223 +msgid "Error fetching the packages" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:224 +msgid "" +"Some problem occured during the fetching of the packages. This is most " +"likely a network problem. Please check your network and try again. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Remove obsolete Packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:264 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -434,50 +445,50 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:254 -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "Checking update system" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:265 +#: ../DistUpgrade/DistUpgradeControler.py:290 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:308 #, fuzzy msgid "Upgrading" msgstr "Opgradering færdig" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:315 msgid "Searching for obsolete software" msgstr "" #. done, ask for reboot -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:67 +#: ../DistUpgrade/DistUpgradeViewGtk.py:70 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:98 +#: ../DistUpgrade/DistUpgradeViewGtk.py:101 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:100 +#: ../DistUpgrade/DistUpgradeViewGtk.py:103 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -485,33 +496,33 @@ 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:123 +#: ../DistUpgrade/DistUpgradeViewGtk.py:126 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#: ../DistUpgrade/DistUpgradeViewGtk.py:139 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:137 +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 msgid "" "During the install a error occured. This is usually a bug in the packages, " "please report it. See the message below for more information. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:224 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +#: ../DistUpgrade/DistUpgradeViewGtk.py:225 msgid "" "During the operation a fatal error occured. Please report this as a bug and " "include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your " "report. The upgrade will abort now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:305 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -521,27 +532,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:319 +#: ../DistUpgrade/DistUpgradeViewGtk.py:316 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:321 +#: ../DistUpgrade/DistUpgradeViewGtk.py:318 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:354 +#: ../DistUpgrade/DistUpgradeViewGtk.py:351 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 msgid "" "Canceling during a upgrade can leave the system in a unstable state. It is " "strongly adviced to continue the operation. " @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-26 13:14+0100\n" +"POT-Creation-Date: 2006-01-26 15:51+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" @@ -399,49 +399,61 @@ msgid "" "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:166 #, fuzzy msgid "Error during update" msgstr "Fehler beim Entfernen des Schlüssels" -#: ../DistUpgrade/DistUpgradeControler.py:165 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:184 +#: ../DistUpgrade/DistUpgradeControler.py:186 msgid "Not enough free space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:185 +#: ../DistUpgrade/DistUpgradeControler.py:187 msgid "" "There is not enough free space on your system to download the required " "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " "clean'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 +#: ../DistUpgrade/DistUpgradeControler.py:192 #, fuzzy msgid "Perform Upgrade?" msgstr "Aktualisierung fertiggestellt" -#: ../DistUpgrade/DistUpgradeControler.py:200 -#: ../DistUpgrade/DistUpgradeControler.py:238 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:263 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:201 +#: ../DistUpgrade/DistUpgradeControler.py:207 msgid "" -"Some problem occured during the upgrade. This is mostly a network problem, " -"please check the network and try again. " +"Some problem occured during the upgrade. Most likely packages failed to " +"install. Try 'sudo apt-get install -f' or synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:223 +#, fuzzy +msgid "Error fetching the packages" +msgstr "Fehler beim Entfernen des Schlüssels" + +#: ../DistUpgrade/DistUpgradeControler.py:224 +msgid "" +"Some problem occured during the fetching of the packages. This is most " +"likely a network problem. Please check your network and try again. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Remove obsolete Packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:264 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -449,50 +461,50 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:254 -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "Checking update system" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:265 +#: ../DistUpgrade/DistUpgradeControler.py:290 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:308 #, fuzzy msgid "Upgrading" msgstr "Aktualisierung fertiggestellt" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:315 msgid "Searching for obsolete software" msgstr "" #. done, ask for reboot -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:67 +#: ../DistUpgrade/DistUpgradeViewGtk.py:70 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:98 +#: ../DistUpgrade/DistUpgradeViewGtk.py:101 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:100 +#: ../DistUpgrade/DistUpgradeViewGtk.py:103 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -500,33 +512,33 @@ 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:123 +#: ../DistUpgrade/DistUpgradeViewGtk.py:126 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#: ../DistUpgrade/DistUpgradeViewGtk.py:139 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:137 +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 msgid "" "During the install a error occured. This is usually a bug in the packages, " "please report it. See the message below for more information. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:224 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +#: ../DistUpgrade/DistUpgradeViewGtk.py:225 msgid "" "During the operation a fatal error occured. Please report this as a bug and " "include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your " "report. The upgrade will abort now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:305 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -536,27 +548,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:319 +#: ../DistUpgrade/DistUpgradeViewGtk.py:316 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:321 +#: ../DistUpgrade/DistUpgradeViewGtk.py:318 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:354 +#: ../DistUpgrade/DistUpgradeViewGtk.py:351 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 msgid "" "Canceling during a upgrade can leave the system in a unstable state. It is " "strongly adviced to continue the operation. " @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-26 13:14+0100\n" +"POT-Creation-Date: 2006-01-26 15:51+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" @@ -370,47 +370,58 @@ msgid "" "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:166 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:165 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:184 +#: ../DistUpgrade/DistUpgradeControler.py:186 msgid "Not enough free space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:185 +#: ../DistUpgrade/DistUpgradeControler.py:187 msgid "" "There is not enough free space on your system to download the required " "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " "clean'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 +#: ../DistUpgrade/DistUpgradeControler.py:192 msgid "Perform Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:200 -#: ../DistUpgrade/DistUpgradeControler.py:238 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:263 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:201 +#: ../DistUpgrade/DistUpgradeControler.py:207 msgid "" -"Some problem occured during the upgrade. This is mostly a network problem, " -"please check the network and try again. " +"Some problem occured during the upgrade. Most likely packages failed to " +"install. Try 'sudo apt-get install -f' or synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:223 +msgid "Error fetching the packages" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:224 +msgid "" +"Some problem occured during the fetching of the packages. This is most " +"likely a network problem. Please check your network and try again. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Remove obsolete Packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:264 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -418,49 +429,49 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:254 -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "Checking update system" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:265 +#: ../DistUpgrade/DistUpgradeControler.py:290 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:308 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:315 msgid "Searching for obsolete software" msgstr "" #. done, ask for reboot -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:67 +#: ../DistUpgrade/DistUpgradeViewGtk.py:70 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:98 +#: ../DistUpgrade/DistUpgradeViewGtk.py:101 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:100 +#: ../DistUpgrade/DistUpgradeViewGtk.py:103 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -468,33 +479,33 @@ 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:123 +#: ../DistUpgrade/DistUpgradeViewGtk.py:126 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#: ../DistUpgrade/DistUpgradeViewGtk.py:139 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:137 +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 msgid "" "During the install a error occured. This is usually a bug in the packages, " "please report it. See the message below for more information. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:224 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +#: ../DistUpgrade/DistUpgradeViewGtk.py:225 msgid "" "During the operation a fatal error occured. Please report this as a bug and " "include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your " "report. The upgrade will abort now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:305 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -504,27 +515,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:319 +#: ../DistUpgrade/DistUpgradeViewGtk.py:316 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:321 +#: ../DistUpgrade/DistUpgradeViewGtk.py:318 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:354 +#: ../DistUpgrade/DistUpgradeViewGtk.py:351 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 msgid "" "Canceling during a upgrade can leave the system in a unstable state. It is " "strongly adviced to continue the operation. " diff --git a/po/en_CA.po b/po/en_CA.po index 35489b7f..8c96204b 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-26 13:14+0100\n" +"POT-Creation-Date: 2006-01-26 15:51+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" @@ -390,49 +390,61 @@ msgid "" "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:166 #, fuzzy msgid "Error during update" msgstr "Error removing the key" -#: ../DistUpgrade/DistUpgradeControler.py:165 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:184 +#: ../DistUpgrade/DistUpgradeControler.py:186 msgid "Not enough free space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:185 +#: ../DistUpgrade/DistUpgradeControler.py:187 msgid "" "There is not enough free space on your system to download the required " "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " "clean'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 +#: ../DistUpgrade/DistUpgradeControler.py:192 #, fuzzy msgid "Perform Upgrade?" msgstr "Upgrade finished" -#: ../DistUpgrade/DistUpgradeControler.py:200 -#: ../DistUpgrade/DistUpgradeControler.py:238 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:263 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:201 +#: ../DistUpgrade/DistUpgradeControler.py:207 msgid "" -"Some problem occured during the upgrade. This is mostly a network problem, " -"please check the network and try again. " +"Some problem occured during the upgrade. Most likely packages failed to " +"install. Try 'sudo apt-get install -f' or synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:223 +#, fuzzy +msgid "Error fetching the packages" +msgstr "Error removing the key" + +#: ../DistUpgrade/DistUpgradeControler.py:224 +msgid "" +"Some problem occured during the fetching of the packages. This is most " +"likely a network problem. Please check your network and try again. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Remove obsolete Packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:264 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -440,50 +452,50 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:254 -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "Checking update system" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:265 +#: ../DistUpgrade/DistUpgradeControler.py:290 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:308 #, fuzzy msgid "Upgrading" msgstr "Upgrade finished" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:315 msgid "Searching for obsolete software" msgstr "" #. done, ask for reboot -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:67 +#: ../DistUpgrade/DistUpgradeViewGtk.py:70 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:98 +#: ../DistUpgrade/DistUpgradeViewGtk.py:101 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:100 +#: ../DistUpgrade/DistUpgradeViewGtk.py:103 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -491,33 +503,33 @@ 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:123 +#: ../DistUpgrade/DistUpgradeViewGtk.py:126 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#: ../DistUpgrade/DistUpgradeViewGtk.py:139 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:137 +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 msgid "" "During the install a error occured. This is usually a bug in the packages, " "please report it. See the message below for more information. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:224 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +#: ../DistUpgrade/DistUpgradeViewGtk.py:225 msgid "" "During the operation a fatal error occured. Please report this as a bug and " "include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your " "report. The upgrade will abort now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:305 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -527,27 +539,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:319 +#: ../DistUpgrade/DistUpgradeViewGtk.py:316 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:321 +#: ../DistUpgrade/DistUpgradeViewGtk.py:318 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:354 +#: ../DistUpgrade/DistUpgradeViewGtk.py:351 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 msgid "" "Canceling during a upgrade can leave the system in a unstable state. It is " "strongly adviced to continue the operation. " @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-26 13:14+0100\n" +"POT-Creation-Date: 2006-01-26 15:51+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" @@ -398,49 +398,61 @@ msgid "" "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:166 #, fuzzy msgid "Error during update" msgstr "Hubo un error al quitar la clave" -#: ../DistUpgrade/DistUpgradeControler.py:165 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:184 +#: ../DistUpgrade/DistUpgradeControler.py:186 msgid "Not enough free space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:185 +#: ../DistUpgrade/DistUpgradeControler.py:187 msgid "" "There is not enough free space on your system to download the required " "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " "clean'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 +#: ../DistUpgrade/DistUpgradeControler.py:192 #, fuzzy msgid "Perform Upgrade?" msgstr "Actualización finalizada" -#: ../DistUpgrade/DistUpgradeControler.py:200 -#: ../DistUpgrade/DistUpgradeControler.py:238 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:263 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:201 +#: ../DistUpgrade/DistUpgradeControler.py:207 msgid "" -"Some problem occured during the upgrade. This is mostly a network problem, " -"please check the network and try again. " +"Some problem occured during the upgrade. Most likely packages failed to " +"install. Try 'sudo apt-get install -f' or synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:223 +#, fuzzy +msgid "Error fetching the packages" +msgstr "Hubo un error al quitar la clave" + +#: ../DistUpgrade/DistUpgradeControler.py:224 +msgid "" +"Some problem occured during the fetching of the packages. This is most " +"likely a network problem. Please check your network and try again. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Remove obsolete Packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:264 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -448,50 +460,50 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:254 -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "Checking update system" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:265 +#: ../DistUpgrade/DistUpgradeControler.py:290 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:308 #, fuzzy msgid "Upgrading" msgstr "Actualización finalizada" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:315 msgid "Searching for obsolete software" msgstr "" #. done, ask for reboot -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:67 +#: ../DistUpgrade/DistUpgradeViewGtk.py:70 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:98 +#: ../DistUpgrade/DistUpgradeViewGtk.py:101 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:100 +#: ../DistUpgrade/DistUpgradeViewGtk.py:103 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -499,33 +511,33 @@ 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:123 +#: ../DistUpgrade/DistUpgradeViewGtk.py:126 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#: ../DistUpgrade/DistUpgradeViewGtk.py:139 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:137 +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 msgid "" "During the install a error occured. This is usually a bug in the packages, " "please report it. See the message below for more information. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:224 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +#: ../DistUpgrade/DistUpgradeViewGtk.py:225 msgid "" "During the operation a fatal error occured. Please report this as a bug and " "include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your " "report. The upgrade will abort now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:305 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -535,27 +547,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:319 +#: ../DistUpgrade/DistUpgradeViewGtk.py:316 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:321 +#: ../DistUpgrade/DistUpgradeViewGtk.py:318 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:354 +#: ../DistUpgrade/DistUpgradeViewGtk.py:351 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 msgid "" "Canceling during a upgrade can leave the system in a unstable state. It is " "strongly adviced to continue the operation. " @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-26 13:14+0100\n" +"POT-Creation-Date: 2006-01-26 15:51+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" @@ -389,49 +389,61 @@ msgid "" "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:166 #, fuzzy msgid "Error during update" msgstr "Virhe poistettaessa avainta" -#: ../DistUpgrade/DistUpgradeControler.py:165 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:184 +#: ../DistUpgrade/DistUpgradeControler.py:186 msgid "Not enough free space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:185 +#: ../DistUpgrade/DistUpgradeControler.py:187 msgid "" "There is not enough free space on your system to download the required " "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " "clean'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 +#: ../DistUpgrade/DistUpgradeControler.py:192 #, fuzzy msgid "Perform Upgrade?" msgstr "Päivitykset suoritettu" -#: ../DistUpgrade/DistUpgradeControler.py:200 -#: ../DistUpgrade/DistUpgradeControler.py:238 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:263 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:201 +#: ../DistUpgrade/DistUpgradeControler.py:207 msgid "" -"Some problem occured during the upgrade. This is mostly a network problem, " -"please check the network and try again. " +"Some problem occured during the upgrade. Most likely packages failed to " +"install. Try 'sudo apt-get install -f' or synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:223 +#, fuzzy +msgid "Error fetching the packages" +msgstr "Virhe poistettaessa avainta" + +#: ../DistUpgrade/DistUpgradeControler.py:224 +msgid "" +"Some problem occured during the fetching of the packages. This is most " +"likely a network problem. Please check your network and try again. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Remove obsolete Packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:264 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -439,50 +451,50 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:254 -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "Checking update system" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:265 +#: ../DistUpgrade/DistUpgradeControler.py:290 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:308 #, fuzzy msgid "Upgrading" msgstr "Päivitykset suoritettu" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:315 msgid "Searching for obsolete software" msgstr "" #. done, ask for reboot -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:67 +#: ../DistUpgrade/DistUpgradeViewGtk.py:70 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:98 +#: ../DistUpgrade/DistUpgradeViewGtk.py:101 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:100 +#: ../DistUpgrade/DistUpgradeViewGtk.py:103 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -490,33 +502,33 @@ 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:123 +#: ../DistUpgrade/DistUpgradeViewGtk.py:126 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#: ../DistUpgrade/DistUpgradeViewGtk.py:139 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:137 +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 msgid "" "During the install a error occured. This is usually a bug in the packages, " "please report it. See the message below for more information. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:224 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +#: ../DistUpgrade/DistUpgradeViewGtk.py:225 msgid "" "During the operation a fatal error occured. Please report this as a bug and " "include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your " "report. The upgrade will abort now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:305 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -526,27 +538,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:319 +#: ../DistUpgrade/DistUpgradeViewGtk.py:316 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:321 +#: ../DistUpgrade/DistUpgradeViewGtk.py:318 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:354 +#: ../DistUpgrade/DistUpgradeViewGtk.py:351 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 msgid "" "Canceling during a upgrade can leave the system in a unstable state. It is " "strongly adviced to continue the operation. " @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.37.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-26 13:14+0100\n" +"POT-Creation-Date: 2006-01-26 15:51+0100\n" "PO-Revision-Date: 2005-04-04 19:43+0200\n" "Last-Translator: \n" "Language-Team: French <gnomefr@traduc.org>\n" @@ -395,49 +395,61 @@ msgid "" "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:166 #, fuzzy msgid "Error during update" msgstr "Erreur lors de la suppression de la clé" -#: ../DistUpgrade/DistUpgradeControler.py:165 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:184 +#: ../DistUpgrade/DistUpgradeControler.py:186 msgid "Not enough free space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:185 +#: ../DistUpgrade/DistUpgradeControler.py:187 msgid "" "There is not enough free space on your system to download the required " "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " "clean'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 +#: ../DistUpgrade/DistUpgradeControler.py:192 #, fuzzy msgid "Perform Upgrade?" msgstr "Mise à jour terminée" -#: ../DistUpgrade/DistUpgradeControler.py:200 -#: ../DistUpgrade/DistUpgradeControler.py:238 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:263 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:201 +#: ../DistUpgrade/DistUpgradeControler.py:207 msgid "" -"Some problem occured during the upgrade. This is mostly a network problem, " -"please check the network and try again. " +"Some problem occured during the upgrade. Most likely packages failed to " +"install. Try 'sudo apt-get install -f' or synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:223 +#, fuzzy +msgid "Error fetching the packages" +msgstr "Erreur lors de la suppression de la clé" + +#: ../DistUpgrade/DistUpgradeControler.py:224 +msgid "" +"Some problem occured during the fetching of the packages. This is most " +"likely a network problem. Please check your network and try again. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Remove obsolete Packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:264 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -445,50 +457,50 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:254 -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "Checking update system" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:265 +#: ../DistUpgrade/DistUpgradeControler.py:290 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:308 #, fuzzy msgid "Upgrading" msgstr "Mise à jour terminée" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:315 msgid "Searching for obsolete software" msgstr "" #. done, ask for reboot -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:67 +#: ../DistUpgrade/DistUpgradeViewGtk.py:70 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:98 +#: ../DistUpgrade/DistUpgradeViewGtk.py:101 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:100 +#: ../DistUpgrade/DistUpgradeViewGtk.py:103 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -496,33 +508,33 @@ 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:123 +#: ../DistUpgrade/DistUpgradeViewGtk.py:126 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#: ../DistUpgrade/DistUpgradeViewGtk.py:139 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:137 +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 msgid "" "During the install a error occured. This is usually a bug in the packages, " "please report it. See the message below for more information. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:224 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +#: ../DistUpgrade/DistUpgradeViewGtk.py:225 msgid "" "During the operation a fatal error occured. Please report this as a bug and " "include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your " "report. The upgrade will abort now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:305 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -532,27 +544,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:319 +#: ../DistUpgrade/DistUpgradeViewGtk.py:316 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:321 +#: ../DistUpgrade/DistUpgradeViewGtk.py:318 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:354 +#: ../DistUpgrade/DistUpgradeViewGtk.py:351 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 msgid "" "Canceling during a upgrade can leave the system in a unstable state. It is " "strongly adviced to continue the operation. " @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-26 13:14+0100\n" +"POT-Creation-Date: 2006-01-26 15:51+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" @@ -391,49 +391,61 @@ msgid "" "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:166 #, fuzzy msgid "Error during update" msgstr "Hiba a kulcs eltávolítása közben" -#: ../DistUpgrade/DistUpgradeControler.py:165 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:184 +#: ../DistUpgrade/DistUpgradeControler.py:186 msgid "Not enough free space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:185 +#: ../DistUpgrade/DistUpgradeControler.py:187 msgid "" "There is not enough free space on your system to download the required " "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " "clean'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 +#: ../DistUpgrade/DistUpgradeControler.py:192 #, fuzzy msgid "Perform Upgrade?" msgstr "A frissítés befejeződött" -#: ../DistUpgrade/DistUpgradeControler.py:200 -#: ../DistUpgrade/DistUpgradeControler.py:238 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:263 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:201 +#: ../DistUpgrade/DistUpgradeControler.py:207 msgid "" -"Some problem occured during the upgrade. This is mostly a network problem, " -"please check the network and try again. " +"Some problem occured during the upgrade. Most likely packages failed to " +"install. Try 'sudo apt-get install -f' or synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:223 +#, fuzzy +msgid "Error fetching the packages" +msgstr "Hiba a kulcs eltávolítása közben" + +#: ../DistUpgrade/DistUpgradeControler.py:224 +msgid "" +"Some problem occured during the fetching of the packages. This is most " +"likely a network problem. Please check your network and try again. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Remove obsolete Packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:264 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -441,50 +453,50 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:254 -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "Checking update system" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:265 +#: ../DistUpgrade/DistUpgradeControler.py:290 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:308 #, fuzzy msgid "Upgrading" msgstr "A frissítés befejeződött" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:315 msgid "Searching for obsolete software" msgstr "" #. done, ask for reboot -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:67 +#: ../DistUpgrade/DistUpgradeViewGtk.py:70 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:98 +#: ../DistUpgrade/DistUpgradeViewGtk.py:101 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:100 +#: ../DistUpgrade/DistUpgradeViewGtk.py:103 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -492,33 +504,33 @@ 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:123 +#: ../DistUpgrade/DistUpgradeViewGtk.py:126 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#: ../DistUpgrade/DistUpgradeViewGtk.py:139 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:137 +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 msgid "" "During the install a error occured. This is usually a bug in the packages, " "please report it. See the message below for more information. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:224 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +#: ../DistUpgrade/DistUpgradeViewGtk.py:225 msgid "" "During the operation a fatal error occured. Please report this as a bug and " "include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your " "report. The upgrade will abort now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:305 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -528,27 +540,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:319 +#: ../DistUpgrade/DistUpgradeViewGtk.py:316 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:321 +#: ../DistUpgrade/DistUpgradeViewGtk.py:318 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:354 +#: ../DistUpgrade/DistUpgradeViewGtk.py:351 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 msgid "" "Canceling during a upgrade can leave the system in a unstable state. It is " "strongly adviced to continue the operation. " @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-26 13:14+0100\n" +"POT-Creation-Date: 2006-01-26 15:51+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" @@ -386,48 +386,60 @@ msgid "" "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:166 #, fuzzy msgid "Error during update" msgstr "キー削除のエラー" -#: ../DistUpgrade/DistUpgradeControler.py:165 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:184 +#: ../DistUpgrade/DistUpgradeControler.py:186 msgid "Not enough free space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:185 +#: ../DistUpgrade/DistUpgradeControler.py:187 msgid "" "There is not enough free space on your system to download the required " "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " "clean'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 +#: ../DistUpgrade/DistUpgradeControler.py:192 msgid "Perform Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:200 -#: ../DistUpgrade/DistUpgradeControler.py:238 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:263 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:201 +#: ../DistUpgrade/DistUpgradeControler.py:207 msgid "" -"Some problem occured during the upgrade. This is mostly a network problem, " -"please check the network and try again. " +"Some problem occured during the upgrade. Most likely packages failed to " +"install. Try 'sudo apt-get install -f' or synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:223 +#, fuzzy +msgid "Error fetching the packages" +msgstr "キー削除のエラー" + +#: ../DistUpgrade/DistUpgradeControler.py:224 +msgid "" +"Some problem occured during the fetching of the packages. This is most " +"likely a network problem. Please check your network and try again. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Remove obsolete Packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:264 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -435,50 +447,50 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:254 -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "Checking update system" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:265 +#: ../DistUpgrade/DistUpgradeControler.py:290 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:308 #, fuzzy msgid "Upgrading" msgstr "アップグレードが終了しました" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:315 msgid "Searching for obsolete software" msgstr "" #. done, ask for reboot -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:67 +#: ../DistUpgrade/DistUpgradeViewGtk.py:70 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:98 +#: ../DistUpgrade/DistUpgradeViewGtk.py:101 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:100 +#: ../DistUpgrade/DistUpgradeViewGtk.py:103 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -486,34 +498,34 @@ 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:123 +#: ../DistUpgrade/DistUpgradeViewGtk.py:126 #, fuzzy msgid "Installing updates ..." msgstr "アップデートをインストール中..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#: ../DistUpgrade/DistUpgradeViewGtk.py:139 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:137 +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 msgid "" "During the install a error occured. This is usually a bug in the packages, " "please report it. See the message below for more information. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:224 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +#: ../DistUpgrade/DistUpgradeViewGtk.py:225 msgid "" "During the operation a fatal error occured. Please report this as a bug and " "include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your " "report. The upgrade will abort now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:305 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -523,27 +535,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:319 +#: ../DistUpgrade/DistUpgradeViewGtk.py:316 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:321 +#: ../DistUpgrade/DistUpgradeViewGtk.py:318 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:354 +#: ../DistUpgrade/DistUpgradeViewGtk.py:351 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 msgid "" "Canceling during a upgrade can leave the system in a unstable state. It is " "strongly adviced to continue the operation. " @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager cvs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-26 13:14+0100\n" +"POT-Creation-Date: 2006-01-26 15:51+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" @@ -386,49 +386,61 @@ msgid "" "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:166 #, fuzzy msgid "Error during update" msgstr "Błąd podczas usuwania klucza" -#: ../DistUpgrade/DistUpgradeControler.py:165 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:184 +#: ../DistUpgrade/DistUpgradeControler.py:186 msgid "Not enough free space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:185 +#: ../DistUpgrade/DistUpgradeControler.py:187 msgid "" "There is not enough free space on your system to download the required " "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " "clean'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 +#: ../DistUpgrade/DistUpgradeControler.py:192 #, fuzzy msgid "Perform Upgrade?" msgstr "Aktualizowanie zakończone" -#: ../DistUpgrade/DistUpgradeControler.py:200 -#: ../DistUpgrade/DistUpgradeControler.py:238 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:263 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:201 +#: ../DistUpgrade/DistUpgradeControler.py:207 msgid "" -"Some problem occured during the upgrade. This is mostly a network problem, " -"please check the network and try again. " +"Some problem occured during the upgrade. Most likely packages failed to " +"install. Try 'sudo apt-get install -f' or synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:223 +#, fuzzy +msgid "Error fetching the packages" +msgstr "Błąd podczas usuwania klucza" + +#: ../DistUpgrade/DistUpgradeControler.py:224 +msgid "" +"Some problem occured during the fetching of the packages. This is most " +"likely a network problem. Please check your network and try again. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Remove obsolete Packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:264 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -436,50 +448,50 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:254 -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "Checking update system" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:265 +#: ../DistUpgrade/DistUpgradeControler.py:290 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:308 #, fuzzy msgid "Upgrading" msgstr "Aktualizowanie zakończone" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:315 msgid "Searching for obsolete software" msgstr "" #. done, ask for reboot -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:67 +#: ../DistUpgrade/DistUpgradeViewGtk.py:70 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:98 +#: ../DistUpgrade/DistUpgradeViewGtk.py:101 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:100 +#: ../DistUpgrade/DistUpgradeViewGtk.py:103 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -487,33 +499,33 @@ 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:123 +#: ../DistUpgrade/DistUpgradeViewGtk.py:126 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#: ../DistUpgrade/DistUpgradeViewGtk.py:139 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:137 +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 msgid "" "During the install a error occured. This is usually a bug in the packages, " "please report it. See the message below for more information. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:224 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +#: ../DistUpgrade/DistUpgradeViewGtk.py:225 msgid "" "During the operation a fatal error occured. Please report this as a bug and " "include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your " "report. The upgrade will abort now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:305 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -523,27 +535,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:319 +#: ../DistUpgrade/DistUpgradeViewGtk.py:316 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:321 +#: ../DistUpgrade/DistUpgradeViewGtk.py:318 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:354 +#: ../DistUpgrade/DistUpgradeViewGtk.py:351 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 msgid "" "Canceling during a upgrade can leave the system in a unstable state. It is " "strongly adviced to continue the operation. " diff --git a/po/pt_BR.po b/po/pt_BR.po index 20885278..dfebed38 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-26 13:14+0100\n" +"POT-Creation-Date: 2006-01-26 15:51+0100\n" "PO-Revision-Date: 2005-03-29 13:36-0300\n" "Last-Translator: Raphael Higino <raphaelh@uai.com.br>\n" "Language-Team: Brazilian Portuguese <gnome-l10n-status@listas.cipsga.org." @@ -369,48 +369,59 @@ msgid "" "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:166 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:165 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:184 +#: ../DistUpgrade/DistUpgradeControler.py:186 msgid "Not enough free space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:185 +#: ../DistUpgrade/DistUpgradeControler.py:187 msgid "" "There is not enough free space on your system to download the required " "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " "clean'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 +#: ../DistUpgrade/DistUpgradeControler.py:192 #, fuzzy msgid "Perform Upgrade?" msgstr "Upgrade terminado" -#: ../DistUpgrade/DistUpgradeControler.py:200 -#: ../DistUpgrade/DistUpgradeControler.py:238 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:263 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:201 +#: ../DistUpgrade/DistUpgradeControler.py:207 msgid "" -"Some problem occured during the upgrade. This is mostly a network problem, " -"please check the network and try again. " +"Some problem occured during the upgrade. Most likely packages failed to " +"install. Try 'sudo apt-get install -f' or synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:223 +msgid "Error fetching the packages" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:224 +msgid "" +"Some problem occured during the fetching of the packages. This is most " +"likely a network problem. Please check your network and try again. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Remove obsolete Packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:264 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -418,50 +429,50 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:254 -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "Checking update system" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:265 +#: ../DistUpgrade/DistUpgradeControler.py:290 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:308 #, fuzzy msgid "Upgrading" msgstr "Upgrade terminado" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:315 msgid "Searching for obsolete software" msgstr "" #. done, ask for reboot -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:67 +#: ../DistUpgrade/DistUpgradeViewGtk.py:70 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:98 +#: ../DistUpgrade/DistUpgradeViewGtk.py:101 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:100 +#: ../DistUpgrade/DistUpgradeViewGtk.py:103 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -469,33 +480,33 @@ 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:123 +#: ../DistUpgrade/DistUpgradeViewGtk.py:126 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#: ../DistUpgrade/DistUpgradeViewGtk.py:139 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:137 +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 msgid "" "During the install a error occured. This is usually a bug in the packages, " "please report it. See the message below for more information. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:224 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +#: ../DistUpgrade/DistUpgradeViewGtk.py:225 msgid "" "During the operation a fatal error occured. Please report this as a bug and " "include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your " "report. The upgrade will abort now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:305 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -505,27 +516,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:319 +#: ../DistUpgrade/DistUpgradeViewGtk.py:316 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:321 +#: ../DistUpgrade/DistUpgradeViewGtk.py:318 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:354 +#: ../DistUpgrade/DistUpgradeViewGtk.py:351 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 msgid "" "Canceling during a upgrade can leave the system in a unstable state. It is " "strongly adviced to continue the operation. " @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-26 13:14+0100\n" +"POT-Creation-Date: 2006-01-26 15:51+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" @@ -382,48 +382,59 @@ msgid "" "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:166 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:165 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:184 +#: ../DistUpgrade/DistUpgradeControler.py:186 msgid "Not enough free space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:185 +#: ../DistUpgrade/DistUpgradeControler.py:187 msgid "" "There is not enough free space on your system to download the required " "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " "clean'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 +#: ../DistUpgrade/DistUpgradeControler.py:192 #, fuzzy msgid "Perform Upgrade?" msgstr "Actualizare completă" -#: ../DistUpgrade/DistUpgradeControler.py:200 -#: ../DistUpgrade/DistUpgradeControler.py:238 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:263 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:201 +#: ../DistUpgrade/DistUpgradeControler.py:207 msgid "" -"Some problem occured during the upgrade. This is mostly a network problem, " -"please check the network and try again. " +"Some problem occured during the upgrade. Most likely packages failed to " +"install. Try 'sudo apt-get install -f' or synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:223 +msgid "Error fetching the packages" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:224 +msgid "" +"Some problem occured during the fetching of the packages. This is most " +"likely a network problem. Please check your network and try again. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Remove obsolete Packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:264 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -431,50 +442,50 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:254 -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "Checking update system" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:265 +#: ../DistUpgrade/DistUpgradeControler.py:290 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:308 #, fuzzy msgid "Upgrading" msgstr "Actualizare completă" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:315 msgid "Searching for obsolete software" msgstr "" #. done, ask for reboot -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:67 +#: ../DistUpgrade/DistUpgradeViewGtk.py:70 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:98 +#: ../DistUpgrade/DistUpgradeViewGtk.py:101 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:100 +#: ../DistUpgrade/DistUpgradeViewGtk.py:103 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -482,33 +493,33 @@ 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:123 +#: ../DistUpgrade/DistUpgradeViewGtk.py:126 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#: ../DistUpgrade/DistUpgradeViewGtk.py:139 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:137 +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 msgid "" "During the install a error occured. This is usually a bug in the packages, " "please report it. See the message below for more information. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:224 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +#: ../DistUpgrade/DistUpgradeViewGtk.py:225 msgid "" "During the operation a fatal error occured. Please report this as a bug and " "include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your " "report. The upgrade will abort now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:305 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -518,27 +529,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:319 +#: ../DistUpgrade/DistUpgradeViewGtk.py:316 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:321 +#: ../DistUpgrade/DistUpgradeViewGtk.py:318 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:354 +#: ../DistUpgrade/DistUpgradeViewGtk.py:351 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 msgid "" "Canceling during a upgrade can leave the system in a unstable state. It is " "strongly adviced to continue the operation. " @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-26 13:14+0100\n" +"POT-Creation-Date: 2006-01-26 15:51+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" @@ -410,49 +410,61 @@ msgid "" "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:166 #, fuzzy msgid "Error during update" msgstr "i Urufunguzo" -#: ../DistUpgrade/DistUpgradeControler.py:165 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:184 +#: ../DistUpgrade/DistUpgradeControler.py:186 msgid "Not enough free space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:185 +#: ../DistUpgrade/DistUpgradeControler.py:187 msgid "" "There is not enough free space on your system to download the required " "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " "clean'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 +#: ../DistUpgrade/DistUpgradeControler.py:192 #, fuzzy msgid "Perform Upgrade?" msgstr "Byarangiye" -#: ../DistUpgrade/DistUpgradeControler.py:200 -#: ../DistUpgrade/DistUpgradeControler.py:238 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:263 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:201 +#: ../DistUpgrade/DistUpgradeControler.py:207 msgid "" -"Some problem occured during the upgrade. This is mostly a network problem, " -"please check the network and try again. " +"Some problem occured during the upgrade. Most likely packages failed to " +"install. Try 'sudo apt-get install -f' or synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:223 +#, fuzzy +msgid "Error fetching the packages" +msgstr "i Urufunguzo" + +#: ../DistUpgrade/DistUpgradeControler.py:224 +msgid "" +"Some problem occured during the fetching of the packages. This is most " +"likely a network problem. Please check your network and try again. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Remove obsolete Packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:264 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -460,50 +472,50 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:254 -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "Checking update system" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:265 +#: ../DistUpgrade/DistUpgradeControler.py:290 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:308 #, fuzzy msgid "Upgrading" msgstr "Byarangiye" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:315 msgid "Searching for obsolete software" msgstr "" #. done, ask for reboot -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:67 +#: ../DistUpgrade/DistUpgradeViewGtk.py:70 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:98 +#: ../DistUpgrade/DistUpgradeViewGtk.py:101 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:100 +#: ../DistUpgrade/DistUpgradeViewGtk.py:103 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -511,33 +523,33 @@ 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:123 +#: ../DistUpgrade/DistUpgradeViewGtk.py:126 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#: ../DistUpgrade/DistUpgradeViewGtk.py:139 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:137 +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 msgid "" "During the install a error occured. This is usually a bug in the packages, " "please report it. See the message below for more information. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:224 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +#: ../DistUpgrade/DistUpgradeViewGtk.py:225 msgid "" "During the operation a fatal error occured. Please report this as a bug and " "include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your " "report. The upgrade will abort now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:305 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -547,27 +559,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:319 +#: ../DistUpgrade/DistUpgradeViewGtk.py:316 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:321 +#: ../DistUpgrade/DistUpgradeViewGtk.py:318 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:354 +#: ../DistUpgrade/DistUpgradeViewGtk.py:351 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 msgid "" "Canceling during a upgrade can leave the system in a unstable state. It is " "strongly adviced to continue the operation. " @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-26 13:14+0100\n" +"POT-Creation-Date: 2006-01-26 15:51+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" @@ -386,49 +386,61 @@ msgid "" "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:166 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:165 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:184 +#: ../DistUpgrade/DistUpgradeControler.py:186 msgid "Not enough free space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:185 +#: ../DistUpgrade/DistUpgradeControler.py:187 msgid "" "There is not enough free space on your system to download the required " "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " "clean'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 +#: ../DistUpgrade/DistUpgradeControler.py:192 #, fuzzy msgid "Perform Upgrade?" msgstr "Uppgraderingar" -#: ../DistUpgrade/DistUpgradeControler.py:200 -#: ../DistUpgrade/DistUpgradeControler.py:238 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:263 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:201 +#: ../DistUpgrade/DistUpgradeControler.py:207 msgid "" -"Some problem occured during the upgrade. This is mostly a network problem, " -"please check the network and try again. " +"Some problem occured during the upgrade. Most likely packages failed to " +"install. Try 'sudo apt-get install -f' or synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:223 +#, fuzzy +msgid "Error fetching the packages" +msgstr "Inga matchande paket hittades" + +#: ../DistUpgrade/DistUpgradeControler.py:224 +msgid "" +"Some problem occured during the fetching of the packages. This is most " +"likely a network problem. Please check your network and try again. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:256 #, fuzzy msgid "Remove obsolete Packages?" msgstr " Ta bort paket " -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:264 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -436,50 +448,50 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:254 -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "Checking update system" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:265 +#: ../DistUpgrade/DistUpgradeControler.py:290 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:308 #, fuzzy msgid "Upgrading" msgstr "Uppgraderingar" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:315 msgid "Searching for obsolete software" msgstr "" #. done, ask for reboot -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:67 +#: ../DistUpgrade/DistUpgradeViewGtk.py:70 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:98 +#: ../DistUpgrade/DistUpgradeViewGtk.py:101 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:100 +#: ../DistUpgrade/DistUpgradeViewGtk.py:103 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -487,34 +499,34 @@ 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:123 +#: ../DistUpgrade/DistUpgradeViewGtk.py:126 #, fuzzy msgid "Installing updates ..." msgstr "Letar efter uppdateringar..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#: ../DistUpgrade/DistUpgradeViewGtk.py:139 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:137 +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 msgid "" "During the install a error occured. This is usually a bug in the packages, " "please report it. See the message below for more information. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:224 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +#: ../DistUpgrade/DistUpgradeViewGtk.py:225 msgid "" "During the operation a fatal error occured. Please report this as a bug and " "include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your " "report. The upgrade will abort now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:305 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -524,28 +536,28 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:319 +#: ../DistUpgrade/DistUpgradeViewGtk.py:316 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:321 +#: ../DistUpgrade/DistUpgradeViewGtk.py:318 #, fuzzy, python-format msgid "To be installed: %s" msgstr "inte installerad" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:354 +#: ../DistUpgrade/DistUpgradeViewGtk.py:351 #, fuzzy msgid "Are you sure you want cancel?" msgstr "Är du säker på att du vill avsluta?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 msgid "" "Canceling during a upgrade can leave the system in a unstable state. It is " "strongly adviced to continue the operation. " @@ -1417,9 +1429,6 @@ msgstr "" #~ msgid "Found 1 matching package" #~ msgstr "Hittade 1 matchande paket" -#~ msgid "No matching packages found" -#~ msgstr "Inga matchande paket hittades" - # Patch = programfix enligt Datatermgruppen # http://www.nada.kth.se/dataterm/rek.html#a141 #~ msgid "Found %d matching patches" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-notifier\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-26 13:14+0100\n" +"POT-Creation-Date: 2006-01-26 15:51+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" @@ -370,47 +370,58 @@ msgid "" "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:166 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:165 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:184 +#: ../DistUpgrade/DistUpgradeControler.py:186 msgid "Not enough free space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:185 +#: ../DistUpgrade/DistUpgradeControler.py:187 msgid "" "There is not enough free space on your system to download the required " "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " "clean'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 +#: ../DistUpgrade/DistUpgradeControler.py:192 msgid "Perform Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:200 -#: ../DistUpgrade/DistUpgradeControler.py:238 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:263 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:201 +#: ../DistUpgrade/DistUpgradeControler.py:207 msgid "" -"Some problem occured during the upgrade. This is mostly a network problem, " -"please check the network and try again. " +"Some problem occured during the upgrade. Most likely packages failed to " +"install. Try 'sudo apt-get install -f' or synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:223 +msgid "Error fetching the packages" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:224 +msgid "" +"Some problem occured during the fetching of the packages. This is most " +"likely a network problem. Please check your network and try again. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Remove obsolete Packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:264 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -418,49 +429,49 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:254 -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "Checking update system" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:265 +#: ../DistUpgrade/DistUpgradeControler.py:290 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:308 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:315 msgid "Searching for obsolete software" msgstr "" #. done, ask for reboot -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:67 +#: ../DistUpgrade/DistUpgradeViewGtk.py:70 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:98 +#: ../DistUpgrade/DistUpgradeViewGtk.py:101 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:100 +#: ../DistUpgrade/DistUpgradeViewGtk.py:103 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -468,33 +479,33 @@ 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:123 +#: ../DistUpgrade/DistUpgradeViewGtk.py:126 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#: ../DistUpgrade/DistUpgradeViewGtk.py:139 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:137 +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 msgid "" "During the install a error occured. This is usually a bug in the packages, " "please report it. See the message below for more information. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:224 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +#: ../DistUpgrade/DistUpgradeViewGtk.py:225 msgid "" "During the operation a fatal error occured. Please report this as a bug and " "include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your " "report. The upgrade will abort now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:305 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -504,27 +515,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:319 +#: ../DistUpgrade/DistUpgradeViewGtk.py:316 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:321 +#: ../DistUpgrade/DistUpgradeViewGtk.py:318 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:354 +#: ../DistUpgrade/DistUpgradeViewGtk.py:351 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 msgid "" "Canceling during a upgrade can leave the system in a unstable state. It is " "strongly adviced to continue the operation. " diff --git a/po/zh_CN.po b/po/zh_CN.po index 58aed300..68cbd74d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-26 13:14+0100\n" +"POT-Creation-Date: 2006-01-26 15:51+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" @@ -380,48 +380,59 @@ msgid "" "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:166 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:165 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:184 +#: ../DistUpgrade/DistUpgradeControler.py:186 msgid "Not enough free space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:185 +#: ../DistUpgrade/DistUpgradeControler.py:187 msgid "" "There is not enough free space on your system to download the required " "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " "clean'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:190 +#: ../DistUpgrade/DistUpgradeControler.py:192 #, fuzzy msgid "Perform Upgrade?" msgstr "更新已经完成" -#: ../DistUpgrade/DistUpgradeControler.py:200 -#: ../DistUpgrade/DistUpgradeControler.py:238 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:263 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:201 +#: ../DistUpgrade/DistUpgradeControler.py:207 msgid "" -"Some problem occured during the upgrade. This is mostly a network problem, " -"please check the network and try again. " +"Some problem occured during the upgrade. Most likely packages failed to " +"install. Try 'sudo apt-get install -f' or synaptic to fix your system." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:223 +msgid "Error fetching the packages" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:224 +msgid "" +"Some problem occured during the fetching of the packages. This is most " +"likely a network problem. Please check your network and try again. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Remove obsolete Packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:239 +#: ../DistUpgrade/DistUpgradeControler.py:264 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -429,50 +440,50 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:254 -#: ../DistUpgrade/DistUpgradeControler.py:273 +#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:298 msgid "Checking update system" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:265 +#: ../DistUpgrade/DistUpgradeControler.py:290 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:279 +#: ../DistUpgrade/DistUpgradeControler.py:304 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:283 +#: ../DistUpgrade/DistUpgradeControler.py:308 #, fuzzy msgid "Upgrading" msgstr "更新已经完成" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:315 msgid "Searching for obsolete software" msgstr "" #. done, ask for reboot -#: ../DistUpgrade/DistUpgradeControler.py:293 +#: ../DistUpgrade/DistUpgradeControler.py:319 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:67 +#: ../DistUpgrade/DistUpgradeViewGtk.py:70 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:98 +#: ../DistUpgrade/DistUpgradeViewGtk.py:101 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:100 +#: ../DistUpgrade/DistUpgradeViewGtk.py:103 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -480,33 +491,33 @@ 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:123 +#: ../DistUpgrade/DistUpgradeViewGtk.py:126 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#: ../DistUpgrade/DistUpgradeViewGtk.py:139 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:137 +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 msgid "" "During the install a error occured. This is usually a bug in the packages, " "please report it. See the message below for more information. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:224 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +#: ../DistUpgrade/DistUpgradeViewGtk.py:225 msgid "" "During the operation a fatal error occured. Please report this as a bug and " "include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your " "report. The upgrade will abort now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#: ../DistUpgrade/DistUpgradeViewGtk.py:305 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -516,27 +527,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:319 +#: ../DistUpgrade/DistUpgradeViewGtk.py:316 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:321 +#: ../DistUpgrade/DistUpgradeViewGtk.py:318 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:354 +#: ../DistUpgrade/DistUpgradeViewGtk.py:351 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 msgid "" "Canceling during a upgrade can leave the system in a unstable state. It is " "strongly adviced to continue the operation. " |