diff --git a/horizon/locale/en/LC_MESSAGES/django.po b/horizon/locale/en/LC_MESSAGES/django.po index 4e605c13c6..55260d2a9d 100644 --- a/horizon/locale/en/LC_MESSAGES/django.po +++ b/horizon/locale/en/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Horizon\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-10 18:20-0500\n" +"POT-Creation-Date: 2013-09-11 18:57+0000\n" "PO-Revision-Date: 2013-04-29 08:33+0000\n" "Last-Translator: Gabriel Hurley \n" "Language-Team: English (http://www.transifex.com/projects/p/openstack/" @@ -48,10 +48,6 @@ msgstr "Unauthorized. Please try logging in again." msgid "Session timed out." msgstr "" -#: middleware.py:98 -msgid "Unauthorized." -msgstr "" - #: browsers/base.py:90 msgid "Navigation Item" msgstr "" diff --git a/horizon/locale/en/LC_MESSAGES/djangojs.po b/horizon/locale/en/LC_MESSAGES/djangojs.po index 7fd23e6bba..eb92b2c1bf 100644 --- a/horizon/locale/en/LC_MESSAGES/djangojs.po +++ b/horizon/locale/en/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-10 18:20-0500\n" +"POT-Creation-Date: 2013-09-11 18:58+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -39,6 +39,10 @@ msgstr "" msgid "No roles" msgstr "" +#: static/horizon/js/horizon.modals.js:33 +msgid "Cancel" +msgstr "" + #: static/horizon/js/horizon.modals.js:125 msgid "There was an error submitting the form. Please try again." msgstr "" diff --git a/horizon/static/horizon/js/horizon.modals.js b/horizon/static/horizon/js/horizon.modals.js index 4034f8ed2f..a47b706d2d 100644 --- a/horizon/static/horizon/js/horizon.modals.js +++ b/horizon/static/horizon/js/horizon.modals.js @@ -30,7 +30,7 @@ horizon.modals.initModal = function (modal) { /* Creates a modal dialog from the client-side template. */ horizon.modals.create = function (title, body, confirm, cancel) { if (!cancel) { - cancel = "Cancel"; + cancel = gettext("Cancel"); } var template = horizon.templates.compiled_templates["#modal_template"], params = {title: title, body: body, confirm: confirm, cancel: cancel}, diff --git a/openstack_dashboard/dashboards/project/instances/workflows/update_instance.py b/openstack_dashboard/dashboards/project/instances/workflows/update_instance.py index 8d90c86c3a..5a09d11548 100644 --- a/openstack_dashboard/dashboards/project/instances/workflows/update_instance.py +++ b/openstack_dashboard/dashboards/project/instances/workflows/update_instance.py @@ -104,7 +104,8 @@ class UpdateInstanceSecurityGroups(workflows.UpdateMembersStep): class UpdateInstanceInfoAction(workflows.Action): - name = forms.CharField(required=True) + name = forms.CharField(required=True, + label=_("Name")) def handle(self, request, data): try: