diff options
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 50 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeViewGtk.py | 33 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | po/da.po | 39 | ||||
| -rw-r--r-- | po/de.po | 39 | ||||
| -rw-r--r-- | po/el.po | 39 | ||||
| -rw-r--r-- | po/en_CA.po | 39 | ||||
| -rw-r--r-- | po/es.po | 39 | ||||
| -rw-r--r-- | po/fi.po | 39 | ||||
| -rw-r--r-- | po/fr.po | 39 | ||||
| -rw-r--r-- | po/hu.po | 39 | ||||
| -rw-r--r-- | po/ja.po | 39 | ||||
| -rw-r--r-- | po/pl.po | 39 | ||||
| -rw-r--r-- | po/pt_BR.po | 39 | ||||
| -rw-r--r-- | po/ro.po | 39 | ||||
| -rw-r--r-- | po/rw.po | 39 | ||||
| -rw-r--r-- | po/sv.po | 39 | ||||
| -rw-r--r-- | po/xh.po | 39 | ||||
| -rw-r--r-- | po/zh_CN.po | 39 |
19 files changed, 471 insertions, 237 deletions
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index a0f5a642..229b7107 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -191,19 +191,42 @@ class DistUpgradeControler(object): self.cache.requiredDownload) return res - def doDistUpgrade(self): + def doDistUpgrade(self, currentTry=0): + currentRetry = 0 fprogress = self._view.getFetchProgress() iprogress = self._view.getInstallProgress() - try: - res = self.cache.commit(fprogress,iprogress) - except (SystemError, IOError), e: - self._view.error(_("Error during commit"), - _("Some problem occured during the upgrade. " - "This is mostly a network problem, please " - "check the network and try again. "), - "%s" % e) - return False - return True + # retry the fetching in case of errors + while currentRetry < 3: + try: + res = self.cache.commit(fprogress,iprogress) + except SystemError, e: + # installing the packages failed, can't be retried + self._view.error(_("Error during commit"), + _("Some problem occured during the upgrade. " + "Most likely packages failed to install. " + "Try 'sudo apt-get install -f' or synaptic " + "to fix your system."), + "%s" % e) + return False + except IOError, e: + # fetch failed, will be retried + logging.error("IOError in cache.commit(): '%s'. Retrying (currentTry: %s)" % (e,currentTry)) + currentRetry += 1 + continue + # no exception, so all was fine, we are done + return True + + # maximum fetch-retries reached without a successful commit + logging.debug("giving up on fetching after maximum retries") + self._view.error(_("Error fetching the packages"), + _("Some problem occured during the fetching " + "of the packages. This is most likely a network " + "problem. Please check your network and try " + "again. "), + "%s" % e) + # abort here because we want our sources.list back + self.abort() + def doPostUpgrade(self): @@ -282,11 +305,12 @@ class DistUpgradeControler(object): self._view.updateStatus(_("Upgrading")) if not self.doDistUpgrade(): - self.abort() + # don't abort here, because it would restore the sources.list + sys.exit(1) # do post-upgrade stuff self._view.setStep(4) - self._view.updateStatus(_("Searching for obsolete software")) + self._view.updateStatus(_("Searching for obsolete software")) self.doPostUpgrade() # done, ask for reboot diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 9ba1a04c..94090322 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -199,6 +199,8 @@ class GtkDistUpgradeView(DistUpgradeView,SimpleGladeApp): self.treeview_details.append_column(column) self.treeview_details.set_model(self.details_list) self.vscrollbar_terminal.set_adjustment(self._term.get_adjustment()) + # work around bug in VteTerminal here + self._term.realize() # Use italic style in the status labels attrlist=pango.AttrList() @@ -206,11 +208,42 @@ class GtkDistUpgradeView(DistUpgradeView,SimpleGladeApp): attrlist.insert(attr) self.label_status.set_property("attributes", attrlist) + # reasonable fault handler + sys.excepthook = self._handleException + + def _handleException(self, type, value, tb): + import traceback + lines = traceback.format_exception(type, value, tb) + logging.error("not handled expection:\n%s" % "\n".join(lines)) + self.error(_("A fatal error occured"), + _("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. "), + "\n".join(lines)) + def create_terminal(self, arg1,arg2,arg3,arg4): " helper to create a vte terminal " self._term = vte.Terminal() self._term.set_font_from_string("monospace 10") + self._term.connect("contents-changed", self._term_content_changed) + self._terminal_lines = [] + self._terminal_log = open(os.path.expanduser("~/dist-upgrade-term.log"),"w") return self._term + def _term_content_changed(self, term): + " called when the *visible* part of the terminal changes " + + # get the current visible text, + current_text = self._term.get_text(lambda a,b,c,d: True) + # see what we have currently and only print stuff that wasn't + # visible last time + new_lines = [] + for line in current_text.split("\n"): + new_lines.append(line) + if not line in self._terminal_lines: + self._terminal_log.write(line+"\n") + self._terminal_log.flush() + self._terminal_lines = new_lines def getFetchProgress(self): return self._fetchProgress def getInstallProgress(self): diff --git a/debian/changelog b/debian/changelog index 38c3b232..91a63585 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ update-manager (0.42.2ubuntu1) dapper; urgency=low * UpdateManager/MetaRelease.py: - never offer a upgrade to a unsupported (i.e. developer) dist + * data/gnome-software-properties.desktop.in: use X-KDE-SubstituteUID=true -- @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-25 12:45+0100\n" +"POT-Creation-Date: 2006-01-26 13:14+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" @@ -462,22 +462,22 @@ msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:66 +#: ../DistUpgrade/DistUpgradeViewGtk.py:67 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:96 +#: ../DistUpgrade/DistUpgradeViewGtk.py:97 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:98 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:99 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -485,22 +485,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:122 +#: ../DistUpgrade/DistUpgradeViewGtk.py:123 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:134 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:137 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:266 +#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +msgid "A fatal error occured" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +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 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -510,27 +521,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:277 +#: ../DistUpgrade/DistUpgradeViewGtk.py:319 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:279 +#: ../DistUpgrade/DistUpgradeViewGtk.py:321 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:281 +#: ../DistUpgrade/DistUpgradeViewGtk.py:323 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:312 +#: ../DistUpgrade/DistUpgradeViewGtk.py:354 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:313 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 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-25 12:45+0100\n" +"POT-Creation-Date: 2006-01-26 13:14+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" @@ -477,22 +477,22 @@ msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:66 +#: ../DistUpgrade/DistUpgradeViewGtk.py:67 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:96 +#: ../DistUpgrade/DistUpgradeViewGtk.py:97 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:98 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:99 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -500,22 +500,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:122 +#: ../DistUpgrade/DistUpgradeViewGtk.py:123 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:134 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:137 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:266 +#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +msgid "A fatal error occured" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +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 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -525,27 +536,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:277 +#: ../DistUpgrade/DistUpgradeViewGtk.py:319 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:279 +#: ../DistUpgrade/DistUpgradeViewGtk.py:321 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:281 +#: ../DistUpgrade/DistUpgradeViewGtk.py:323 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:312 +#: ../DistUpgrade/DistUpgradeViewGtk.py:354 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:313 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 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-25 12:45+0100\n" +"POT-Creation-Date: 2006-01-26 13:14+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" @@ -445,22 +445,22 @@ msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:66 +#: ../DistUpgrade/DistUpgradeViewGtk.py:67 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:96 +#: ../DistUpgrade/DistUpgradeViewGtk.py:97 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:98 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:99 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -468,22 +468,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:122 +#: ../DistUpgrade/DistUpgradeViewGtk.py:123 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:134 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:137 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:266 +#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +msgid "A fatal error occured" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +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 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -493,27 +504,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:277 +#: ../DistUpgrade/DistUpgradeViewGtk.py:319 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:279 +#: ../DistUpgrade/DistUpgradeViewGtk.py:321 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:281 +#: ../DistUpgrade/DistUpgradeViewGtk.py:323 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:312 +#: ../DistUpgrade/DistUpgradeViewGtk.py:354 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:313 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 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 576479d4..35489b7f 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-25 12:45+0100\n" +"POT-Creation-Date: 2006-01-26 13:14+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" @@ -468,22 +468,22 @@ msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:66 +#: ../DistUpgrade/DistUpgradeViewGtk.py:67 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:96 +#: ../DistUpgrade/DistUpgradeViewGtk.py:97 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:98 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:99 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -491,22 +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:122 +#: ../DistUpgrade/DistUpgradeViewGtk.py:123 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:134 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:137 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:266 +#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +msgid "A fatal error occured" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +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 #, 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:277 +#: ../DistUpgrade/DistUpgradeViewGtk.py:319 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:279 +#: ../DistUpgrade/DistUpgradeViewGtk.py:321 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:281 +#: ../DistUpgrade/DistUpgradeViewGtk.py:323 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:312 +#: ../DistUpgrade/DistUpgradeViewGtk.py:354 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:313 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 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-25 12:45+0100\n" +"POT-Creation-Date: 2006-01-26 13:14+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" @@ -476,22 +476,22 @@ msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:66 +#: ../DistUpgrade/DistUpgradeViewGtk.py:67 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:96 +#: ../DistUpgrade/DistUpgradeViewGtk.py:97 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:98 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:99 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -499,22 +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:122 +#: ../DistUpgrade/DistUpgradeViewGtk.py:123 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:134 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:137 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:266 +#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +msgid "A fatal error occured" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +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 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -524,27 +535,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:277 +#: ../DistUpgrade/DistUpgradeViewGtk.py:319 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:279 +#: ../DistUpgrade/DistUpgradeViewGtk.py:321 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:281 +#: ../DistUpgrade/DistUpgradeViewGtk.py:323 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:312 +#: ../DistUpgrade/DistUpgradeViewGtk.py:354 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:313 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 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-25 12:45+0100\n" +"POT-Creation-Date: 2006-01-26 13:14+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" @@ -467,22 +467,22 @@ msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:66 +#: ../DistUpgrade/DistUpgradeViewGtk.py:67 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:96 +#: ../DistUpgrade/DistUpgradeViewGtk.py:97 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:98 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:99 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -490,22 +490,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:122 +#: ../DistUpgrade/DistUpgradeViewGtk.py:123 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:134 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:137 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:266 +#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +msgid "A fatal error occured" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +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 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -515,27 +526,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:277 +#: ../DistUpgrade/DistUpgradeViewGtk.py:319 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:279 +#: ../DistUpgrade/DistUpgradeViewGtk.py:321 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:281 +#: ../DistUpgrade/DistUpgradeViewGtk.py:323 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:312 +#: ../DistUpgrade/DistUpgradeViewGtk.py:354 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:313 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 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-25 12:45+0100\n" +"POT-Creation-Date: 2006-01-26 13:14+0100\n" "PO-Revision-Date: 2005-04-04 19:43+0200\n" "Last-Translator: \n" "Language-Team: French <gnomefr@traduc.org>\n" @@ -473,22 +473,22 @@ msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:66 +#: ../DistUpgrade/DistUpgradeViewGtk.py:67 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:96 +#: ../DistUpgrade/DistUpgradeViewGtk.py:97 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:98 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:99 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -496,22 +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:122 +#: ../DistUpgrade/DistUpgradeViewGtk.py:123 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:134 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:137 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:266 +#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +msgid "A fatal error occured" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +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 #, 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:277 +#: ../DistUpgrade/DistUpgradeViewGtk.py:319 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:279 +#: ../DistUpgrade/DistUpgradeViewGtk.py:321 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:281 +#: ../DistUpgrade/DistUpgradeViewGtk.py:323 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:312 +#: ../DistUpgrade/DistUpgradeViewGtk.py:354 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:313 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 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-25 12:45+0100\n" +"POT-Creation-Date: 2006-01-26 13:14+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" @@ -469,22 +469,22 @@ msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:66 +#: ../DistUpgrade/DistUpgradeViewGtk.py:67 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:96 +#: ../DistUpgrade/DistUpgradeViewGtk.py:97 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:98 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:99 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -492,22 +492,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:122 +#: ../DistUpgrade/DistUpgradeViewGtk.py:123 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:134 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:137 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:266 +#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +msgid "A fatal error occured" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +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 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -517,27 +528,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:277 +#: ../DistUpgrade/DistUpgradeViewGtk.py:319 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:279 +#: ../DistUpgrade/DistUpgradeViewGtk.py:321 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:281 +#: ../DistUpgrade/DistUpgradeViewGtk.py:323 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:312 +#: ../DistUpgrade/DistUpgradeViewGtk.py:354 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:313 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 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-25 12:45+0100\n" +"POT-Creation-Date: 2006-01-26 13:14+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" @@ -463,22 +463,22 @@ msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:66 +#: ../DistUpgrade/DistUpgradeViewGtk.py:67 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:96 +#: ../DistUpgrade/DistUpgradeViewGtk.py:97 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:98 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:99 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -486,23 +486,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:122 +#: ../DistUpgrade/DistUpgradeViewGtk.py:123 #, fuzzy msgid "Installing updates ..." msgstr "アップデートをインストール中..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:134 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:137 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:266 +#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +msgid "A fatal error occured" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +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 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -512,27 +523,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:277 +#: ../DistUpgrade/DistUpgradeViewGtk.py:319 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:279 +#: ../DistUpgrade/DistUpgradeViewGtk.py:321 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:281 +#: ../DistUpgrade/DistUpgradeViewGtk.py:323 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:312 +#: ../DistUpgrade/DistUpgradeViewGtk.py:354 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:313 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 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-25 12:45+0100\n" +"POT-Creation-Date: 2006-01-26 13:14+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" @@ -464,22 +464,22 @@ msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:66 +#: ../DistUpgrade/DistUpgradeViewGtk.py:67 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:96 +#: ../DistUpgrade/DistUpgradeViewGtk.py:97 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:98 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:99 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -487,22 +487,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:122 +#: ../DistUpgrade/DistUpgradeViewGtk.py:123 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:134 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:137 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:266 +#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +msgid "A fatal error occured" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +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 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -512,27 +523,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:277 +#: ../DistUpgrade/DistUpgradeViewGtk.py:319 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:279 +#: ../DistUpgrade/DistUpgradeViewGtk.py:321 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:281 +#: ../DistUpgrade/DistUpgradeViewGtk.py:323 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:312 +#: ../DistUpgrade/DistUpgradeViewGtk.py:354 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:313 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 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 7be44cb1..20885278 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-25 12:45+0100\n" +"POT-Creation-Date: 2006-01-26 13:14+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." @@ -446,22 +446,22 @@ msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:66 +#: ../DistUpgrade/DistUpgradeViewGtk.py:67 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:96 +#: ../DistUpgrade/DistUpgradeViewGtk.py:97 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:98 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:99 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -469,22 +469,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:122 +#: ../DistUpgrade/DistUpgradeViewGtk.py:123 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:134 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:137 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:266 +#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +msgid "A fatal error occured" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +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 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -494,27 +505,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:277 +#: ../DistUpgrade/DistUpgradeViewGtk.py:319 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:279 +#: ../DistUpgrade/DistUpgradeViewGtk.py:321 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:281 +#: ../DistUpgrade/DistUpgradeViewGtk.py:323 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:312 +#: ../DistUpgrade/DistUpgradeViewGtk.py:354 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:313 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 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-25 12:45+0100\n" +"POT-Creation-Date: 2006-01-26 13:14+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" @@ -459,22 +459,22 @@ msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:66 +#: ../DistUpgrade/DistUpgradeViewGtk.py:67 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:96 +#: ../DistUpgrade/DistUpgradeViewGtk.py:97 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:98 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:99 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -482,22 +482,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:122 +#: ../DistUpgrade/DistUpgradeViewGtk.py:123 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:134 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:137 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:266 +#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +msgid "A fatal error occured" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +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 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -507,27 +518,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:277 +#: ../DistUpgrade/DistUpgradeViewGtk.py:319 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:279 +#: ../DistUpgrade/DistUpgradeViewGtk.py:321 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:281 +#: ../DistUpgrade/DistUpgradeViewGtk.py:323 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:312 +#: ../DistUpgrade/DistUpgradeViewGtk.py:354 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:313 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 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-25 12:45+0100\n" +"POT-Creation-Date: 2006-01-26 13:14+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" @@ -488,22 +488,22 @@ msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:66 +#: ../DistUpgrade/DistUpgradeViewGtk.py:67 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:96 +#: ../DistUpgrade/DistUpgradeViewGtk.py:97 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:98 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:99 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -511,22 +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:122 +#: ../DistUpgrade/DistUpgradeViewGtk.py:123 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:134 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:137 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:266 +#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +msgid "A fatal error occured" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +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 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -536,27 +547,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:277 +#: ../DistUpgrade/DistUpgradeViewGtk.py:319 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:279 +#: ../DistUpgrade/DistUpgradeViewGtk.py:321 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:281 +#: ../DistUpgrade/DistUpgradeViewGtk.py:323 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:312 +#: ../DistUpgrade/DistUpgradeViewGtk.py:354 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:313 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 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-25 12:45+0100\n" +"POT-Creation-Date: 2006-01-26 13:14+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" @@ -464,22 +464,22 @@ msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:66 +#: ../DistUpgrade/DistUpgradeViewGtk.py:67 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:96 +#: ../DistUpgrade/DistUpgradeViewGtk.py:97 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:98 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:99 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -487,23 +487,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:122 +#: ../DistUpgrade/DistUpgradeViewGtk.py:123 #, fuzzy msgid "Installing updates ..." msgstr "Letar efter uppdateringar..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:134 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:137 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:266 +#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +msgid "A fatal error occured" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +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 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -513,28 +524,28 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:277 +#: ../DistUpgrade/DistUpgradeViewGtk.py:319 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:279 +#: ../DistUpgrade/DistUpgradeViewGtk.py:321 #, fuzzy, python-format msgid "To be installed: %s" msgstr "inte installerad" -#: ../DistUpgrade/DistUpgradeViewGtk.py:281 +#: ../DistUpgrade/DistUpgradeViewGtk.py:323 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:312 +#: ../DistUpgrade/DistUpgradeViewGtk.py:354 #, fuzzy msgid "Are you sure you want cancel?" msgstr "Är du säker på att du vill avsluta?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:313 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 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-notifier\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-25 12:45+0100\n" +"POT-Creation-Date: 2006-01-26 13:14+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" @@ -445,22 +445,22 @@ msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:66 +#: ../DistUpgrade/DistUpgradeViewGtk.py:67 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:96 +#: ../DistUpgrade/DistUpgradeViewGtk.py:97 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:98 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:99 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -468,22 +468,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:122 +#: ../DistUpgrade/DistUpgradeViewGtk.py:123 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:134 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:137 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:266 +#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +msgid "A fatal error occured" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +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 #, python-format msgid "" "%s packages are going to be removed.\n" @@ -493,27 +504,27 @@ msgid "" "%s needs to be fetched" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:277 +#: ../DistUpgrade/DistUpgradeViewGtk.py:319 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:279 +#: ../DistUpgrade/DistUpgradeViewGtk.py:321 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:281 +#: ../DistUpgrade/DistUpgradeViewGtk.py:323 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:312 +#: ../DistUpgrade/DistUpgradeViewGtk.py:354 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:313 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 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 60d184fd..58aed300 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-25 12:45+0100\n" +"POT-Creation-Date: 2006-01-26 13:14+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" @@ -457,22 +457,22 @@ msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:66 +#: ../DistUpgrade/DistUpgradeViewGtk.py:67 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:96 +#: ../DistUpgrade/DistUpgradeViewGtk.py:97 #, python-format msgid "Downloading file %li of %li with %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:97 +#: ../DistUpgrade/DistUpgradeViewGtk.py:98 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:99 +#: ../DistUpgrade/DistUpgradeViewGtk.py:100 #, python-format msgid "Downloading file %li of %li with unknown speed" msgstr "" @@ -480,22 +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:122 +#: ../DistUpgrade/DistUpgradeViewGtk.py:123 msgid "Installing updates ..." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:134 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, python-format msgid "Error installing '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:137 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:266 +#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +msgid "A fatal error occured" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:220 +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 #, 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:277 +#: ../DistUpgrade/DistUpgradeViewGtk.py:319 #, python-format msgid "<b>To be removed: %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:279 +#: ../DistUpgrade/DistUpgradeViewGtk.py:321 #, python-format msgid "To be installed: %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:281 +#: ../DistUpgrade/DistUpgradeViewGtk.py:323 #, python-format msgid "To be upgraded: %s" msgstr "" #. print "on_window_main_delete_event()" -#: ../DistUpgrade/DistUpgradeViewGtk.py:312 +#: ../DistUpgrade/DistUpgradeViewGtk.py:354 msgid "Are you sure you want cancel?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:313 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "" "Canceling during a upgrade can leave the system in a unstable state. It is " "strongly adviced to continue the operation. " |