Merge lp:~vibhavp/ubuntu/quantal/sessioninstaller/lp-790500 into lp:ubuntu/quantal/sessioninstaller

Proposed by Vibhav Pant
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~vibhavp/ubuntu/quantal/sessioninstaller/lp-790500
Merge into: lp:ubuntu/quantal/sessioninstaller
Diff against target: 25 lines (+2/-2)
2 files modified
po/de.po (+1/-1)
sessioninstaller/core.py (+1/-1)
To merge this branch: bzr merge lp:~vibhavp/ubuntu/quantal/sessioninstaller/lp-790500
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+107514@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thank you for your bug report, setting as merged since that bug got fixed already in r129:
https://code.launchpad.net/~evfool/sessioninstaller/fix790500/+merge/63524

the fix will be uploaded to ubuntu with the next update, it doesn't seem worth an upload by itself

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'po/de.po'
--- po/de.po 2010-05-27 10:03:53 +0000
+++ po/de.po 2012-05-26 14:08:18 +0000
@@ -167,7 +167,7 @@
167#: ../sessioninstaller/core.py:597167#: ../sessioninstaller/core.py:597
168#, python-format168#, python-format
169msgid ""169msgid ""
170"The file '%s' isn't a valid software catalog. Please redownload or contanct "170"The file '%s' isn't a valid software catalog. Please redownload or contact "
171"the provider."171"the provider."
172msgstr ""172msgstr ""
173173
174174
=== modified file 'sessioninstaller/core.py'
--- sessioninstaller/core.py 2012-04-25 15:04:59 +0000
+++ sessioninstaller/core.py 2012-05-26 14:08:18 +0000
@@ -768,7 +768,7 @@
768 header = _("Catalog could not be read")768 header = _("Catalog could not be read")
769 #TRANSLATORS: %s is a file path769 #TRANSLATORS: %s is a file path
770 message = _("The file '%s' isn't a valid software catalog. "770 message = _("The file '%s' isn't a valid software catalog. "
771 "Please redownload or contanct the "771 "Please redownload or contact the "
772 "provider.") % catalog_file772 "provider.") % catalog_file
773 self._show_error(header, message)773 self._show_error(header, message)
774 raise errors.ModifyFailed(message)774 raise errors.ModifyFailed(message)

Subscribers

People subscribed via source and target branches

to all changes: