=== modified file 'AppInstall/distros/Ubuntu.py' --- AppInstall/distros/Ubuntu.py 2008-09-17 14:43:06 +0000 +++ AppInstall/distros/Ubuntu.py 2009-01-16 10:17:45 +0000 @@ -164,10 +164,11 @@ "Updates may be available in a newer version of " "Ubuntu.") % (app.name, self.get_distro_release()) else: - return _("Canonical provides critical updates for %s until " - "%s %s.") % (app.name, - support_end_month_str, - support_end_year) + return _("Canonical provides critical updates for %(appname)s until" + " %(support_end_month_str)s " + "%(support_end_year)s.") % {'appname' : app.name, + 'support_end_month_str' : support_end_month_str, + 'support_end_year' : support_end_year} elif app.component == "restricted": if support_ended: return _("Canonical does no longer provide " @@ -175,11 +176,12 @@ "Updates may be available in a newer version of " "Ubuntu.") % (app.name, self.get_distro_release()) else: - return _("Canonical provides critical updates supplied by the " - "developers of %s until %s %s.") % (app.name, - support_end_month_str, - support_end_year) - + eturn _("Canonical provides critical updates supplied by the " + "developers of %(appname)s until %(support_end_month_str)s " + "%(support_end_year)s.") % {'appname' : app.name, + 'support_end_month_str' : support_end_month_str, + 'support_end_year' : support_end_year} + # if we couldn't fiure a support date, use a generic maintenance # string without the date if app.thirdparty or app.channel: