diff --git a/horizon/api/keystone.py b/horizon/api/keystone.py index d749a6796..9bf872c8d 100644 --- a/horizon/api/keystone.py +++ b/horizon/api/keystone.py @@ -262,6 +262,10 @@ def get_default_role(request): return DEFAULT_ROLE +def list_ec2_credentials(request, user_id): + return keystoneclient(request).ec2.list(user_id) + + def create_ec2_credentials(request, user_id, tenant_id): return keystoneclient(request).ec2.create(user_id, tenant_id) diff --git a/horizon/dashboards/settings/ec2/forms.py b/horizon/dashboards/settings/ec2/forms.py index 7e6928f70..d3e55196a 100644 --- a/horizon/dashboards/settings/ec2/forms.py +++ b/horizon/dashboards/settings/ec2/forms.py @@ -58,13 +58,27 @@ class DownloadX509Credentials(forms.SelfHandlingForm): self.fields['tenant'].choices = tenant_choices def handle(self, request, data): + def find_or_create_access_keys(request, tenant_id): + keys = api.keystone.list_ec2_credentials(request, request.user.id) + if keys: + #TODO(jakedahn): Once real CRUD is created, we can allow user + # to generate per access/secret pair. + return keys[0] + else: + return api.keystone.create_ec2_credentials(request, + request.user.id, + tenant_id) try: + # NOTE(jakedahn): Keystone errors unless we specifically scope + # the token to tenant before making the call. + api.keystone.token_create_scoped(request, + data.get('tenant'), + request.user.token) credentials = api.nova.get_x509_credentials(request) cacert = api.nova.get_x509_root_certificate(request) - access_secret = api.keystone.create_ec2_credentials(request, - request.user.id, data.get('tenant')) - context = {'ec2_access_key': access_secret.access, - 'ec2_secret_key': access_secret.secret, + keys = find_or_create_access_keys(request, data.get('tenant')) + context = {'ec2_access_key': keys.access, + 'ec2_secret_key': keys.secret, 'ec2_endpoint': api.url_for(request, 'identity')} except: exceptions.handle(request, diff --git a/horizon/dashboards/settings/ec2/tests.py b/horizon/dashboards/settings/ec2/tests.py index f7d71d836..9c0e3ca86 100644 --- a/horizon/dashboards/settings/ec2/tests.py +++ b/horizon/dashboards/settings/ec2/tests.py @@ -32,6 +32,8 @@ class EC2SettingsTest(test.TestCase): cert = self.certs.first() self.mox.StubOutWithMock(api.keystone, "tenant_list") + self.mox.StubOutWithMock(api.keystone, "token_create_scoped") + self.mox.StubOutWithMock(api.keystone, "list_ec2_credentials") self.mox.StubOutWithMock(api.nova, "get_x509_credentials") self.mox.StubOutWithMock(api.nova, "get_x509_root_certificate") self.mox.StubOutWithMock(api.keystone, "create_ec2_credentials") @@ -41,8 +43,14 @@ class EC2SettingsTest(test.TestCase): .AndReturn(self.tenants.list()) # POST request + api.keystone.token_create_scoped(IsA(HttpRequest), + self.tenant.id, + IsA(str)) \ + .AndReturn(self.tokens.scoped_token) api.keystone.tenant_list(IsA(HttpRequest)) \ .AndReturn(self.tenants.list()) + api.keystone.list_ec2_credentials(IsA(HttpRequest), self.user.id) \ + .AndReturn([]) api.nova.get_x509_credentials(IsA(HttpRequest)).AndReturn(cert) api.nova.get_x509_root_certificate(IsA(HttpRequest)) \ .AndReturn(cert) diff --git a/horizon/dashboards/settings/templates/settings/ec2/download_form.html b/horizon/dashboards/settings/templates/settings/ec2/download_form.html index aa9036264..dbd6bee80 100644 --- a/horizon/dashboards/settings/templates/settings/ec2/download_form.html +++ b/horizon/dashboards/settings/templates/settings/ec2/download_form.html @@ -5,7 +5,7 @@ {% block form_action %}{% url horizon:settings:ec2:index %}{% endblock %} {% block modal_id %}x509_download_modal{% endblock %} -{% block modal-header %}{% trans "Download x509 Credentials" %}{% endblock %} +{% block modal-header %}{% trans "Download EC2 Credentials" %}{% endblock %} {% block modal-body %}
@@ -15,11 +15,11 @@

{% trans "Description:" %}

-

{% trans 'Clicking "Download x509 Credentials" will download a zip file which contains your x509 private key and certificate.' %}

+

{% trans 'Clicking "Download EC2 Credentials" will download a zip file which includes an rc file with your access/secret keys, as well as your x509 private key and certificate.' %}

{% endblock %} {% block modal-footer %} - + {% if hide %}{% trans "Cancel" %}{% endif %} {% endblock %} diff --git a/horizon/dashboards/settings/templates/settings/ec2/index.html b/horizon/dashboards/settings/templates/settings/ec2/index.html index 9f542d9af..cc72fdf3d 100644 --- a/horizon/dashboards/settings/templates/settings/ec2/index.html +++ b/horizon/dashboards/settings/templates/settings/ec2/index.html @@ -1,9 +1,9 @@ {% extends 'settings/base.html' %} {% load i18n %} -{% block title %}{% trans "Download x509 Credentials" %}{% endblock %} +{% block title %}{% trans "Download EC2 Credentials" %}{% endblock %} {% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Download x509 Credentials") %} + {% include "horizon/common/_page_header.html" with title=_("Download EC2 Credentials") %} {% endblock page_header %} {% block settings_main %} diff --git a/horizon/locale/es/LC_MESSAGES/django.po b/horizon/locale/es/LC_MESSAGES/django.po index 1300e7295..fe0355203 100644 --- a/horizon/locale/es/LC_MESSAGES/django.po +++ b/horizon/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: openstack-dashboard\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-14 13:53-0700\n" +"POT-Creation-Date: 2012-03-14 14:44-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -66,12 +66,12 @@ msgid "Error fetching floating ips: %s" msgstr "" #: dashboards/nova/access_and_security/floating_ips/forms.py:48 -#: dashboards/nova/access_and_security/floating_ips/tables.py:92 +#: dashboards/nova/access_and_security/floating_ips/tables.py:93 #: dashboards/nova/instances_and_volumes/instances/tables.py:56 #: dashboards/nova/instances_and_volumes/instances/tables.py:68 #: dashboards/nova/instances_and_volumes/instances/tables.py:83 -#: dashboards/nova/instances_and_volumes/instances/tables.py:108 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:168 +#: dashboards/nova/instances_and_volumes/instances/tables.py:109 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:167 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:42 msgid "Instance" msgstr "" @@ -115,7 +115,7 @@ msgid "Floating IP" msgstr "" #: dashboards/nova/access_and_security/floating_ips/tables.py:47 -#: dashboards/nova/access_and_security/floating_ips/tables.py:106 +#: dashboards/nova/access_and_security/floating_ips/tables.py:107 #: dashboards/syspanel/projects/forms.py:119 msgid "Floating IPs" msgstr "" @@ -129,22 +129,22 @@ msgstr "" msgid "Disassociate IP" msgstr "" -#: dashboards/nova/access_and_security/floating_ips/tables.py:81 +#: dashboards/nova/access_and_security/floating_ips/tables.py:82 #, python-format msgid "Successfully disassociated Floating IP: %s" msgstr "" -#: dashboards/nova/access_and_security/floating_ips/tables.py:85 +#: dashboards/nova/access_and_security/floating_ips/tables.py:86 msgid "Unable to disassociate floating IP." msgstr "" -#: dashboards/nova/access_and_security/floating_ips/tables.py:90 -#: dashboards/nova/instances_and_volumes/instances/tables.py:214 +#: dashboards/nova/access_and_security/floating_ips/tables.py:91 +#: dashboards/nova/instances_and_volumes/instances/tables.py:219 #: dashboards/syspanel/instances/tables.py:49 msgid "IP Address" msgstr "" -#: dashboards/nova/access_and_security/floating_ips/tables.py:95 +#: dashboards/nova/access_and_security/floating_ips/tables.py:96 msgid "Floating IP Pool" msgstr "" @@ -329,12 +329,12 @@ msgstr "" #: dashboards/nova/access_and_security/security_groups/tables.py:57 #: dashboards/nova/images_and_snapshots/images/forms.py:42 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:120 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:137 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:119 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:136 #: dashboards/syspanel/flavors/forms.py:37 #: dashboards/syspanel/projects/forms.py:60 #: dashboards/syspanel/projects/forms.py:85 -#: dashboards/syspanel/projects/tables.py:72 +#: dashboards/syspanel/projects/tables.py:74 #: dashboards/syspanel/users/forms.py:63 msgid "Name" msgstr "" @@ -342,7 +342,7 @@ msgstr "" #: dashboards/nova/access_and_security/security_groups/tables.py:58 #: dashboards/nova/instances_and_volumes/volumes/forms.py:29 #: dashboards/nova/instances_and_volumes/volumes/forms.py:93 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:123 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:122 #: dashboards/nova/templates/nova/access_and_security/keypairs/_create.html:16 #: dashboards/nova/templates/nova/access_and_security/keypairs/_import.html:16 #: dashboards/nova/templates/nova/access_and_security/security_groups/_create.html:17 @@ -353,7 +353,7 @@ msgstr "" #: dashboards/nova/templates/nova/objects/_upload.html:17 #: dashboards/syspanel/projects/forms.py:63 #: dashboards/syspanel/projects/forms.py:88 -#: dashboards/syspanel/projects/tables.py:74 +#: dashboards/syspanel/projects/tables.py:76 #: dashboards/syspanel/templates/syspanel/flavors/_create.html:17 #: dashboards/syspanel/templates/syspanel/images/_update.html:17 #: dashboards/syspanel/templates/syspanel/projects/_add_user.html:17 @@ -411,7 +411,7 @@ msgid "Unable to create container." msgstr "" #: dashboards/nova/containers/forms.py:59 -#: dashboards/nova/containers/tables.py:169 +#: dashboards/nova/containers/tables.py:170 msgid "Object Name" msgstr "" @@ -445,33 +445,33 @@ msgid "Unable to copy object." msgstr "" #: dashboards/nova/containers/panel.py:28 -#: dashboards/nova/containers/tables.py:37 +#: dashboards/nova/containers/tables.py:36 #: dashboards/nova/containers/tables.py:114 #: dashboards/nova/templates/nova/containers/index.html:8 msgid "Containers" msgstr "" -#: dashboards/nova/containers/tables.py:36 +#: dashboards/nova/containers/tables.py:35 msgid "Container" msgstr "" -#: dashboards/nova/containers/tables.py:53 +#: dashboards/nova/containers/tables.py:52 #, python-format msgid "Unable to delete non-empty container: %s" msgstr "" -#: dashboards/nova/containers/tables.py:57 +#: dashboards/nova/containers/tables.py:56 #, python-format msgid "Successfully deleted containers: %s" msgstr "" -#: dashboards/nova/containers/tables.py:64 +#: dashboards/nova/containers/tables.py:63 #: dashboards/nova/templates/nova/containers/_create.html:22 #: dashboards/nova/templates/nova/containers/create.html:6 msgid "Create Container" msgstr "" -#: dashboards/nova/containers/tables.py:71 +#: dashboards/nova/containers/tables.py:70 msgid "List Objects" msgstr "" @@ -482,14 +482,14 @@ msgstr "" #: dashboards/nova/containers/tables.py:105 #: dashboards/nova/containers/tables.py:121 -#: dashboards/nova/containers/tables.py:177 +#: dashboards/nova/containers/tables.py:178 msgid "Objects" msgstr "" #: dashboards/nova/containers/tables.py:107 -#: dashboards/nova/containers/tables.py:170 -#: dashboards/nova/instances_and_volumes/instances/tables.py:215 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:124 +#: dashboards/nova/containers/tables.py:171 +#: dashboards/nova/instances_and_volumes/instances/tables.py:220 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:123 #: dashboards/syspanel/instances/tables.py:50 msgid "Size" msgstr "" @@ -666,8 +666,8 @@ msgid "Image Name" msgstr "" #: dashboards/nova/images_and_snapshots/images/tables.py:76 -#: dashboards/nova/instances_and_volumes/instances/tables.py:218 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:127 +#: dashboards/nova/instances_and_volumes/instances/tables.py:223 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:126 #: dashboards/nova/templates/nova/images_and_snapshots/images/detail.html:12 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:6 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:9 @@ -705,13 +705,13 @@ msgstr "" #: dashboards/nova/images_and_snapshots/images/views.py:115 #: dashboards/nova/images_and_snapshots/snapshots/tables.py:28 -#: dashboards/nova/instances_and_volumes/instances/tables.py:144 +#: dashboards/nova/instances_and_volumes/instances/tables.py:147 msgid "Snapshot" msgstr "" #: dashboards/nova/images_and_snapshots/images/views.py:118 #: dashboards/nova/instances_and_volumes/volumes/tables.py:35 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:155 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:154 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:74 msgid "Volume" msgstr "" @@ -763,11 +763,11 @@ msgid "Volume Snapshot" msgstr "" #: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:31 -#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:43 +#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:42 msgid "Volume Snapshots" msgstr "" -#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:39 +#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:38 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:10 msgid "Volume ID" msgstr "" @@ -806,8 +806,8 @@ msgstr "" #: dashboards/nova/instances_and_volumes/instances/tables.py:57 #: dashboards/nova/instances_and_volumes/instances/tables.py:69 #: dashboards/nova/instances_and_volumes/instances/tables.py:84 -#: dashboards/nova/instances_and_volumes/instances/tables.py:109 -#: dashboards/nova/instances_and_volumes/instances/tables.py:232 +#: dashboards/nova/instances_and_volumes/instances/tables.py:110 +#: dashboards/nova/instances_and_volumes/instances/tables.py:237 #: dashboards/syspanel/instances/tables.py:67 #: dashboards/syspanel/projects/forms.py:115 #: dashboards/syspanel/templates/syspanel/instances/index.html:3 @@ -838,61 +838,61 @@ msgstr "" msgid "Unpaused" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:106 +#: dashboards/nova/instances_and_volumes/instances/tables.py:107 msgid "Suspend" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:106 +#: dashboards/nova/instances_and_volumes/instances/tables.py:107 msgid "Resume" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:107 +#: dashboards/nova/instances_and_volumes/instances/tables.py:108 msgid "Suspended" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:107 +#: dashboards/nova/instances_and_volumes/instances/tables.py:108 msgid "Resumed" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:131 +#: dashboards/nova/instances_and_volumes/instances/tables.py:133 #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:53 #: dashboards/nova/templates/nova/images_and_snapshots/images/launch.html:13 msgid "Launch Instance" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:137 +#: dashboards/nova/instances_and_volumes/instances/tables.py:140 msgid "Edit Instance" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:154 +#: dashboards/nova/instances_and_volumes/instances/tables.py:157 msgid "VNC Console" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:163 +#: dashboards/nova/instances_and_volumes/instances/tables.py:167 msgid "View Log" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:190 +#: dashboards/nova/instances_and_volumes/instances/tables.py:195 #, python-format msgid "%(RAM)s RAM | %(VCPU)s VCPU | %(disk)s Disk" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:195 +#: dashboards/nova/instances_and_volumes/instances/tables.py:200 msgid "Not available" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:213 +#: dashboards/nova/instances_and_volumes/instances/tables.py:218 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:10 -#: dashboards/syspanel/instances/tables.py:48 usage/tables.py:45 +#: dashboards/syspanel/instances/tables.py:48 usage/tables.py:46 msgid "Instance Name" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:222 +#: dashboards/nova/instances_and_volumes/instances/tables.py:227 #: dashboards/syspanel/instances/tables.py:57 msgid "Task" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:228 +#: dashboards/nova/instances_and_volumes/instances/tables.py:233 #: dashboards/syspanel/instances/tables.py:63 msgid "Power State" msgstr "" @@ -960,49 +960,49 @@ msgid "Error Creating Volume Snapshot: %(exc)s" msgstr "" #: dashboards/nova/instances_and_volumes/volumes/tables.py:36 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:144 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:156 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:143 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:155 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:68 #: dashboards/syspanel/projects/forms.py:116 msgid "Volumes" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:53 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:52 msgid "Volumes in error states cannot be deleted via the Nova API." msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:59 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:58 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_create.html:23 msgid "Create Volume" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:66 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:65 msgid "Edit Attachments" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:76 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:75 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html:8 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html:23 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/create.html:3 msgid "Create Snapshot" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:94 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:93 #: templatetags/sizeformat.py:58 #, python-format msgid "%s GB" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:140 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:139 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:35 msgid "Attachments" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:153 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:152 msgid "Detach" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:154 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:153 msgid "Detached" msgstr "" @@ -1171,13 +1171,13 @@ msgstr "" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:20 #: dashboards/syspanel/flavors/forms.py:38 #: dashboards/syspanel/flavors/tables.py:30 -#: dashboards/syspanel/projects/forms.py:114 usage/tables.py:17 +#: dashboards/syspanel/projects/forms.py:114 usage/tables.py:18 msgid "VCPUs" msgstr "" #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:37 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:21 -#: usage/tables.py:18 +#: usage/tables.py:19 msgid "Disk" msgstr "" @@ -1318,7 +1318,7 @@ msgid "Instance ID" msgstr "" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:19 -#: usage/tables.py:20 +#: usage/tables.py:21 msgid "RAM" msgstr "" @@ -1474,11 +1474,11 @@ msgstr "" msgid "Unable to retrieve tenant list." msgstr "" -#: dashboards/settings/ec2/forms.py:71 +#: dashboards/settings/ec2/forms.py:85 msgid "Unable to fetch EC2 credentials." msgstr "" -#: dashboards/settings/ec2/forms.py:84 +#: dashboards/settings/ec2/forms.py:98 #, python-format msgid "Error writing zipfile: %(exc)s" msgstr "" @@ -1496,13 +1496,14 @@ msgstr "" #: dashboards/settings/templates/settings/ec2/download_form.html:23 #: dashboards/settings/templates/settings/ec2/index.html:3 #: dashboards/settings/templates/settings/ec2/index.html:6 -msgid "Download x509 Credentials" +msgid "Download EC2 Credentials" msgstr "" #: dashboards/settings/templates/settings/ec2/download_form.html:18 msgid "" -"Clicking \"Download x509 Credentials\" will download a zip file which " -"contains your x509 private key and certificate." +"Clicking \"Download EC2 Credentials\" will download a zip file which " +"includes an rc file with your access/secret keys, as well as your x509 " +"private key and certificate." msgstr "" #: dashboards/settings/templates/settings/project/_openrc.html:8 @@ -1612,8 +1613,8 @@ msgid "Tenant" msgstr "" #: dashboards/syspanel/instances/tables.py:42 -#: dashboards/syspanel/projects/tables.py:89 -#: dashboards/syspanel/users/tables.py:90 +#: dashboards/syspanel/projects/tables.py:91 +#: dashboards/syspanel/users/tables.py:92 msgid "User" msgstr "" @@ -1636,9 +1637,9 @@ msgstr "" #: dashboards/syspanel/projects/forms.py:64 #: dashboards/syspanel/projects/forms.py:89 -#: dashboards/syspanel/projects/tables.py:75 +#: dashboards/syspanel/projects/tables.py:77 #: dashboards/syspanel/services/tables.py:51 -#: dashboards/syspanel/users/tables.py:127 +#: dashboards/syspanel/users/tables.py:129 msgid "Enabled" msgstr "" @@ -1653,7 +1654,7 @@ msgstr "" #: dashboards/syspanel/projects/forms.py:83 #: dashboards/syspanel/users/forms.py:105 -#: dashboards/syspanel/users/tables.py:121 +#: dashboards/syspanel/users/tables.py:123 msgid "ID" msgstr "" @@ -1707,57 +1708,57 @@ msgstr "" msgid "Modify Users" msgstr "" -#: dashboards/syspanel/projects/tables.py:30 +#: dashboards/syspanel/projects/tables.py:31 msgid "View Usage" msgstr "" -#: dashboards/syspanel/projects/tables.py:36 +#: dashboards/syspanel/projects/tables.py:38 msgid "Edit Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:43 +#: dashboards/syspanel/projects/tables.py:45 msgid "Create New Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:49 +#: dashboards/syspanel/projects/tables.py:51 msgid "Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:50 -#: dashboards/syspanel/projects/tables.py:79 +#: dashboards/syspanel/projects/tables.py:52 +#: dashboards/syspanel/projects/tables.py:81 #: dashboards/syspanel/templates/syspanel/projects/index.html:8 msgid "Projects" msgstr "" -#: dashboards/syspanel/projects/tables.py:71 +#: dashboards/syspanel/projects/tables.py:73 #: dashboards/syspanel/services/tables.py:47 msgid "Id" msgstr "" -#: dashboards/syspanel/projects/tables.py:87 +#: dashboards/syspanel/projects/tables.py:89 msgid "Remove" msgstr "" -#: dashboards/syspanel/projects/tables.py:88 +#: dashboards/syspanel/projects/tables.py:90 msgid "Removed" msgstr "" -#: dashboards/syspanel/projects/tables.py:90 +#: dashboards/syspanel/projects/tables.py:92 #: dashboards/syspanel/templates/syspanel/users/index.html:8 -#: dashboards/syspanel/users/tables.py:91 -#: dashboards/syspanel/users/tables.py:133 +#: dashboards/syspanel/users/tables.py:93 +#: dashboards/syspanel/users/tables.py:135 msgid "Users" msgstr "" -#: dashboards/syspanel/projects/tables.py:101 +#: dashboards/syspanel/projects/tables.py:103 msgid "Users For Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:108 +#: dashboards/syspanel/projects/tables.py:110 msgid "Add To Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:120 +#: dashboards/syspanel/projects/tables.py:122 msgid "Add New Users" msgstr "" @@ -1773,15 +1774,15 @@ msgstr "" msgid "Unable to retrieve roles." msgstr "" -#: dashboards/syspanel/quotas/tables.py:27 +#: dashboards/syspanel/quotas/tables.py:24 msgid "Quota Name" msgstr "" -#: dashboards/syspanel/quotas/tables.py:28 +#: dashboards/syspanel/quotas/tables.py:25 msgid "Limit" msgstr "" -#: dashboards/syspanel/quotas/tables.py:35 +#: dashboards/syspanel/quotas/tables.py:32 msgid "Quotas" msgstr "" @@ -1915,7 +1916,7 @@ msgstr "" #: dashboards/syspanel/users/forms.py:64 #: dashboards/syspanel/users/forms.py:107 -#: dashboards/syspanel/users/tables.py:123 +#: dashboards/syspanel/users/tables.py:125 msgid "Email" msgstr "" @@ -1948,7 +1949,7 @@ msgid "Unable to create user." msgstr "" #: dashboards/syspanel/users/forms.py:106 -#: dashboards/syspanel/users/tables.py:122 views/auth_forms.py:64 +#: dashboards/syspanel/users/tables.py:124 views/auth_forms.py:64 msgid "User Name" msgstr "" @@ -1986,44 +1987,44 @@ msgstr "" msgid "Enable Users" msgstr "" -#: dashboards/syspanel/users/tables.py:45 +#: dashboards/syspanel/users/tables.py:46 #, python-format msgid "Error enabling user: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:48 +#: dashboards/syspanel/users/tables.py:49 #, python-format msgid "Enabled the following users: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:51 +#: dashboards/syspanel/users/tables.py:52 #, python-format msgid "Successfully enabled users: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:58 +#: dashboards/syspanel/users/tables.py:59 msgid "Disable" msgstr "" -#: dashboards/syspanel/users/tables.py:59 +#: dashboards/syspanel/users/tables.py:60 msgid "Disable Users" msgstr "" -#: dashboards/syspanel/users/tables.py:69 +#: dashboards/syspanel/users/tables.py:71 msgid "You cannot disable the user you are currently logged in as." msgstr "" -#: dashboards/syspanel/users/tables.py:77 +#: dashboards/syspanel/users/tables.py:79 #, python-format msgid "Error disabling user: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:80 +#: dashboards/syspanel/users/tables.py:82 #, python-format msgid "Disabled the following users: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:84 +#: dashboards/syspanel/users/tables.py:86 #, python-format msgid "Successfully disabled users: %s" msgstr "" @@ -2037,26 +2038,26 @@ msgstr "" msgid "Unable to update user." msgstr "" -#: tables/actions.py:431 +#: tables/actions.py:451 #, python-format msgid "You do not have permission to %(action)s: %(objs)s" msgstr "" -#: tables/actions.py:437 +#: tables/actions.py:457 #, python-format msgid "Unable to %(action)s: %(objs)s" msgstr "" -#: tables/actions.py:443 +#: tables/actions.py:463 #, python-format msgid "%(action)s: %(objs)s" msgstr "" -#: tables/actions.py:453 +#: tables/actions.py:473 msgid "Delete" msgstr "" -#: tables/actions.py:454 +#: tables/actions.py:474 msgid "Deleted" msgstr "" @@ -2224,23 +2225,23 @@ msgstr "" msgid "Download CSV Summary" msgstr "" -#: usage/tables.py:22 +#: usage/tables.py:23 msgid "VCPU Hours" msgstr "" -#: usage/tables.py:27 +#: usage/tables.py:28 msgid "Project ID" msgstr "" -#: usage/tables.py:29 +#: usage/tables.py:30 msgid "Disk GB Hours" msgstr "" -#: usage/tables.py:37 usage/tables.py:55 +#: usage/tables.py:38 usage/tables.py:56 msgid "Usage Summary" msgstr "" -#: usage/tables.py:47 +#: usage/tables.py:48 msgid "Uptime" msgstr "" diff --git a/horizon/locale/fr/LC_MESSAGES/django.po b/horizon/locale/fr/LC_MESSAGES/django.po index f93e88451..37b69f1e3 100644 --- a/horizon/locale/fr/LC_MESSAGES/django.po +++ b/horizon/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: openstack-dashboard\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-14 13:53-0700\n" +"POT-Creation-Date: 2012-03-14 14:44-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -66,12 +66,12 @@ msgid "Error fetching floating ips: %s" msgstr "" #: dashboards/nova/access_and_security/floating_ips/forms.py:48 -#: dashboards/nova/access_and_security/floating_ips/tables.py:92 +#: dashboards/nova/access_and_security/floating_ips/tables.py:93 #: dashboards/nova/instances_and_volumes/instances/tables.py:56 #: dashboards/nova/instances_and_volumes/instances/tables.py:68 #: dashboards/nova/instances_and_volumes/instances/tables.py:83 -#: dashboards/nova/instances_and_volumes/instances/tables.py:108 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:168 +#: dashboards/nova/instances_and_volumes/instances/tables.py:109 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:167 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:42 msgid "Instance" msgstr "" @@ -115,7 +115,7 @@ msgid "Floating IP" msgstr "" #: dashboards/nova/access_and_security/floating_ips/tables.py:47 -#: dashboards/nova/access_and_security/floating_ips/tables.py:106 +#: dashboards/nova/access_and_security/floating_ips/tables.py:107 #: dashboards/syspanel/projects/forms.py:119 msgid "Floating IPs" msgstr "" @@ -129,22 +129,22 @@ msgstr "" msgid "Disassociate IP" msgstr "" -#: dashboards/nova/access_and_security/floating_ips/tables.py:81 +#: dashboards/nova/access_and_security/floating_ips/tables.py:82 #, python-format msgid "Successfully disassociated Floating IP: %s" msgstr "" -#: dashboards/nova/access_and_security/floating_ips/tables.py:85 +#: dashboards/nova/access_and_security/floating_ips/tables.py:86 msgid "Unable to disassociate floating IP." msgstr "" -#: dashboards/nova/access_and_security/floating_ips/tables.py:90 -#: dashboards/nova/instances_and_volumes/instances/tables.py:214 +#: dashboards/nova/access_and_security/floating_ips/tables.py:91 +#: dashboards/nova/instances_and_volumes/instances/tables.py:219 #: dashboards/syspanel/instances/tables.py:49 msgid "IP Address" msgstr "" -#: dashboards/nova/access_and_security/floating_ips/tables.py:95 +#: dashboards/nova/access_and_security/floating_ips/tables.py:96 msgid "Floating IP Pool" msgstr "" @@ -329,12 +329,12 @@ msgstr "" #: dashboards/nova/access_and_security/security_groups/tables.py:57 #: dashboards/nova/images_and_snapshots/images/forms.py:42 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:120 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:137 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:119 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:136 #: dashboards/syspanel/flavors/forms.py:37 #: dashboards/syspanel/projects/forms.py:60 #: dashboards/syspanel/projects/forms.py:85 -#: dashboards/syspanel/projects/tables.py:72 +#: dashboards/syspanel/projects/tables.py:74 #: dashboards/syspanel/users/forms.py:63 msgid "Name" msgstr "" @@ -342,7 +342,7 @@ msgstr "" #: dashboards/nova/access_and_security/security_groups/tables.py:58 #: dashboards/nova/instances_and_volumes/volumes/forms.py:29 #: dashboards/nova/instances_and_volumes/volumes/forms.py:93 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:123 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:122 #: dashboards/nova/templates/nova/access_and_security/keypairs/_create.html:16 #: dashboards/nova/templates/nova/access_and_security/keypairs/_import.html:16 #: dashboards/nova/templates/nova/access_and_security/security_groups/_create.html:17 @@ -353,7 +353,7 @@ msgstr "" #: dashboards/nova/templates/nova/objects/_upload.html:17 #: dashboards/syspanel/projects/forms.py:63 #: dashboards/syspanel/projects/forms.py:88 -#: dashboards/syspanel/projects/tables.py:74 +#: dashboards/syspanel/projects/tables.py:76 #: dashboards/syspanel/templates/syspanel/flavors/_create.html:17 #: dashboards/syspanel/templates/syspanel/images/_update.html:17 #: dashboards/syspanel/templates/syspanel/projects/_add_user.html:17 @@ -411,7 +411,7 @@ msgid "Unable to create container." msgstr "" #: dashboards/nova/containers/forms.py:59 -#: dashboards/nova/containers/tables.py:169 +#: dashboards/nova/containers/tables.py:170 msgid "Object Name" msgstr "" @@ -445,33 +445,33 @@ msgid "Unable to copy object." msgstr "" #: dashboards/nova/containers/panel.py:28 -#: dashboards/nova/containers/tables.py:37 +#: dashboards/nova/containers/tables.py:36 #: dashboards/nova/containers/tables.py:114 #: dashboards/nova/templates/nova/containers/index.html:8 msgid "Containers" msgstr "" -#: dashboards/nova/containers/tables.py:36 +#: dashboards/nova/containers/tables.py:35 msgid "Container" msgstr "" -#: dashboards/nova/containers/tables.py:53 +#: dashboards/nova/containers/tables.py:52 #, python-format msgid "Unable to delete non-empty container: %s" msgstr "" -#: dashboards/nova/containers/tables.py:57 +#: dashboards/nova/containers/tables.py:56 #, python-format msgid "Successfully deleted containers: %s" msgstr "" -#: dashboards/nova/containers/tables.py:64 +#: dashboards/nova/containers/tables.py:63 #: dashboards/nova/templates/nova/containers/_create.html:22 #: dashboards/nova/templates/nova/containers/create.html:6 msgid "Create Container" msgstr "" -#: dashboards/nova/containers/tables.py:71 +#: dashboards/nova/containers/tables.py:70 msgid "List Objects" msgstr "" @@ -482,14 +482,14 @@ msgstr "" #: dashboards/nova/containers/tables.py:105 #: dashboards/nova/containers/tables.py:121 -#: dashboards/nova/containers/tables.py:177 +#: dashboards/nova/containers/tables.py:178 msgid "Objects" msgstr "" #: dashboards/nova/containers/tables.py:107 -#: dashboards/nova/containers/tables.py:170 -#: dashboards/nova/instances_and_volumes/instances/tables.py:215 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:124 +#: dashboards/nova/containers/tables.py:171 +#: dashboards/nova/instances_and_volumes/instances/tables.py:220 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:123 #: dashboards/syspanel/instances/tables.py:50 msgid "Size" msgstr "" @@ -666,8 +666,8 @@ msgid "Image Name" msgstr "" #: dashboards/nova/images_and_snapshots/images/tables.py:76 -#: dashboards/nova/instances_and_volumes/instances/tables.py:218 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:127 +#: dashboards/nova/instances_and_volumes/instances/tables.py:223 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:126 #: dashboards/nova/templates/nova/images_and_snapshots/images/detail.html:12 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:6 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:9 @@ -705,13 +705,13 @@ msgstr "" #: dashboards/nova/images_and_snapshots/images/views.py:115 #: dashboards/nova/images_and_snapshots/snapshots/tables.py:28 -#: dashboards/nova/instances_and_volumes/instances/tables.py:144 +#: dashboards/nova/instances_and_volumes/instances/tables.py:147 msgid "Snapshot" msgstr "" #: dashboards/nova/images_and_snapshots/images/views.py:118 #: dashboards/nova/instances_and_volumes/volumes/tables.py:35 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:155 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:154 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:74 msgid "Volume" msgstr "" @@ -763,11 +763,11 @@ msgid "Volume Snapshot" msgstr "" #: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:31 -#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:43 +#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:42 msgid "Volume Snapshots" msgstr "" -#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:39 +#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:38 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:10 msgid "Volume ID" msgstr "" @@ -806,8 +806,8 @@ msgstr "" #: dashboards/nova/instances_and_volumes/instances/tables.py:57 #: dashboards/nova/instances_and_volumes/instances/tables.py:69 #: dashboards/nova/instances_and_volumes/instances/tables.py:84 -#: dashboards/nova/instances_and_volumes/instances/tables.py:109 -#: dashboards/nova/instances_and_volumes/instances/tables.py:232 +#: dashboards/nova/instances_and_volumes/instances/tables.py:110 +#: dashboards/nova/instances_and_volumes/instances/tables.py:237 #: dashboards/syspanel/instances/tables.py:67 #: dashboards/syspanel/projects/forms.py:115 #: dashboards/syspanel/templates/syspanel/instances/index.html:3 @@ -838,61 +838,61 @@ msgstr "" msgid "Unpaused" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:106 +#: dashboards/nova/instances_and_volumes/instances/tables.py:107 msgid "Suspend" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:106 +#: dashboards/nova/instances_and_volumes/instances/tables.py:107 msgid "Resume" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:107 +#: dashboards/nova/instances_and_volumes/instances/tables.py:108 msgid "Suspended" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:107 +#: dashboards/nova/instances_and_volumes/instances/tables.py:108 msgid "Resumed" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:131 +#: dashboards/nova/instances_and_volumes/instances/tables.py:133 #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:53 #: dashboards/nova/templates/nova/images_and_snapshots/images/launch.html:13 msgid "Launch Instance" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:137 +#: dashboards/nova/instances_and_volumes/instances/tables.py:140 msgid "Edit Instance" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:154 +#: dashboards/nova/instances_and_volumes/instances/tables.py:157 msgid "VNC Console" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:163 +#: dashboards/nova/instances_and_volumes/instances/tables.py:167 msgid "View Log" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:190 +#: dashboards/nova/instances_and_volumes/instances/tables.py:195 #, python-format msgid "%(RAM)s RAM | %(VCPU)s VCPU | %(disk)s Disk" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:195 +#: dashboards/nova/instances_and_volumes/instances/tables.py:200 msgid "Not available" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:213 +#: dashboards/nova/instances_and_volumes/instances/tables.py:218 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:10 -#: dashboards/syspanel/instances/tables.py:48 usage/tables.py:45 +#: dashboards/syspanel/instances/tables.py:48 usage/tables.py:46 msgid "Instance Name" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:222 +#: dashboards/nova/instances_and_volumes/instances/tables.py:227 #: dashboards/syspanel/instances/tables.py:57 msgid "Task" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:228 +#: dashboards/nova/instances_and_volumes/instances/tables.py:233 #: dashboards/syspanel/instances/tables.py:63 msgid "Power State" msgstr "" @@ -960,49 +960,49 @@ msgid "Error Creating Volume Snapshot: %(exc)s" msgstr "" #: dashboards/nova/instances_and_volumes/volumes/tables.py:36 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:144 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:156 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:143 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:155 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:68 #: dashboards/syspanel/projects/forms.py:116 msgid "Volumes" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:53 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:52 msgid "Volumes in error states cannot be deleted via the Nova API." msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:59 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:58 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_create.html:23 msgid "Create Volume" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:66 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:65 msgid "Edit Attachments" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:76 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:75 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html:8 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html:23 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/create.html:3 msgid "Create Snapshot" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:94 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:93 #: templatetags/sizeformat.py:58 #, python-format msgid "%s GB" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:140 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:139 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:35 msgid "Attachments" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:153 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:152 msgid "Detach" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:154 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:153 msgid "Detached" msgstr "" @@ -1171,13 +1171,13 @@ msgstr "" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:20 #: dashboards/syspanel/flavors/forms.py:38 #: dashboards/syspanel/flavors/tables.py:30 -#: dashboards/syspanel/projects/forms.py:114 usage/tables.py:17 +#: dashboards/syspanel/projects/forms.py:114 usage/tables.py:18 msgid "VCPUs" msgstr "" #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:37 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:21 -#: usage/tables.py:18 +#: usage/tables.py:19 msgid "Disk" msgstr "" @@ -1318,7 +1318,7 @@ msgid "Instance ID" msgstr "" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:19 -#: usage/tables.py:20 +#: usage/tables.py:21 msgid "RAM" msgstr "" @@ -1474,11 +1474,11 @@ msgstr "" msgid "Unable to retrieve tenant list." msgstr "" -#: dashboards/settings/ec2/forms.py:71 +#: dashboards/settings/ec2/forms.py:85 msgid "Unable to fetch EC2 credentials." msgstr "" -#: dashboards/settings/ec2/forms.py:84 +#: dashboards/settings/ec2/forms.py:98 #, python-format msgid "Error writing zipfile: %(exc)s" msgstr "" @@ -1496,13 +1496,14 @@ msgstr "" #: dashboards/settings/templates/settings/ec2/download_form.html:23 #: dashboards/settings/templates/settings/ec2/index.html:3 #: dashboards/settings/templates/settings/ec2/index.html:6 -msgid "Download x509 Credentials" +msgid "Download EC2 Credentials" msgstr "" #: dashboards/settings/templates/settings/ec2/download_form.html:18 msgid "" -"Clicking \"Download x509 Credentials\" will download a zip file which " -"contains your x509 private key and certificate." +"Clicking \"Download EC2 Credentials\" will download a zip file which " +"includes an rc file with your access/secret keys, as well as your x509 " +"private key and certificate." msgstr "" #: dashboards/settings/templates/settings/project/_openrc.html:8 @@ -1612,8 +1613,8 @@ msgid "Tenant" msgstr "" #: dashboards/syspanel/instances/tables.py:42 -#: dashboards/syspanel/projects/tables.py:89 -#: dashboards/syspanel/users/tables.py:90 +#: dashboards/syspanel/projects/tables.py:91 +#: dashboards/syspanel/users/tables.py:92 msgid "User" msgstr "" @@ -1636,9 +1637,9 @@ msgstr "" #: dashboards/syspanel/projects/forms.py:64 #: dashboards/syspanel/projects/forms.py:89 -#: dashboards/syspanel/projects/tables.py:75 +#: dashboards/syspanel/projects/tables.py:77 #: dashboards/syspanel/services/tables.py:51 -#: dashboards/syspanel/users/tables.py:127 +#: dashboards/syspanel/users/tables.py:129 msgid "Enabled" msgstr "" @@ -1653,7 +1654,7 @@ msgstr "" #: dashboards/syspanel/projects/forms.py:83 #: dashboards/syspanel/users/forms.py:105 -#: dashboards/syspanel/users/tables.py:121 +#: dashboards/syspanel/users/tables.py:123 msgid "ID" msgstr "" @@ -1707,57 +1708,57 @@ msgstr "" msgid "Modify Users" msgstr "" -#: dashboards/syspanel/projects/tables.py:30 +#: dashboards/syspanel/projects/tables.py:31 msgid "View Usage" msgstr "" -#: dashboards/syspanel/projects/tables.py:36 +#: dashboards/syspanel/projects/tables.py:38 msgid "Edit Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:43 +#: dashboards/syspanel/projects/tables.py:45 msgid "Create New Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:49 +#: dashboards/syspanel/projects/tables.py:51 msgid "Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:50 -#: dashboards/syspanel/projects/tables.py:79 +#: dashboards/syspanel/projects/tables.py:52 +#: dashboards/syspanel/projects/tables.py:81 #: dashboards/syspanel/templates/syspanel/projects/index.html:8 msgid "Projects" msgstr "" -#: dashboards/syspanel/projects/tables.py:71 +#: dashboards/syspanel/projects/tables.py:73 #: dashboards/syspanel/services/tables.py:47 msgid "Id" msgstr "" -#: dashboards/syspanel/projects/tables.py:87 +#: dashboards/syspanel/projects/tables.py:89 msgid "Remove" msgstr "" -#: dashboards/syspanel/projects/tables.py:88 +#: dashboards/syspanel/projects/tables.py:90 msgid "Removed" msgstr "" -#: dashboards/syspanel/projects/tables.py:90 +#: dashboards/syspanel/projects/tables.py:92 #: dashboards/syspanel/templates/syspanel/users/index.html:8 -#: dashboards/syspanel/users/tables.py:91 -#: dashboards/syspanel/users/tables.py:133 +#: dashboards/syspanel/users/tables.py:93 +#: dashboards/syspanel/users/tables.py:135 msgid "Users" msgstr "" -#: dashboards/syspanel/projects/tables.py:101 +#: dashboards/syspanel/projects/tables.py:103 msgid "Users For Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:108 +#: dashboards/syspanel/projects/tables.py:110 msgid "Add To Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:120 +#: dashboards/syspanel/projects/tables.py:122 msgid "Add New Users" msgstr "" @@ -1773,15 +1774,15 @@ msgstr "" msgid "Unable to retrieve roles." msgstr "" -#: dashboards/syspanel/quotas/tables.py:27 +#: dashboards/syspanel/quotas/tables.py:24 msgid "Quota Name" msgstr "" -#: dashboards/syspanel/quotas/tables.py:28 +#: dashboards/syspanel/quotas/tables.py:25 msgid "Limit" msgstr "" -#: dashboards/syspanel/quotas/tables.py:35 +#: dashboards/syspanel/quotas/tables.py:32 msgid "Quotas" msgstr "" @@ -1915,7 +1916,7 @@ msgstr "" #: dashboards/syspanel/users/forms.py:64 #: dashboards/syspanel/users/forms.py:107 -#: dashboards/syspanel/users/tables.py:123 +#: dashboards/syspanel/users/tables.py:125 msgid "Email" msgstr "" @@ -1948,7 +1949,7 @@ msgid "Unable to create user." msgstr "" #: dashboards/syspanel/users/forms.py:106 -#: dashboards/syspanel/users/tables.py:122 views/auth_forms.py:64 +#: dashboards/syspanel/users/tables.py:124 views/auth_forms.py:64 msgid "User Name" msgstr "" @@ -1986,44 +1987,44 @@ msgstr "" msgid "Enable Users" msgstr "" -#: dashboards/syspanel/users/tables.py:45 +#: dashboards/syspanel/users/tables.py:46 #, python-format msgid "Error enabling user: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:48 +#: dashboards/syspanel/users/tables.py:49 #, python-format msgid "Enabled the following users: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:51 +#: dashboards/syspanel/users/tables.py:52 #, python-format msgid "Successfully enabled users: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:58 +#: dashboards/syspanel/users/tables.py:59 msgid "Disable" msgstr "" -#: dashboards/syspanel/users/tables.py:59 +#: dashboards/syspanel/users/tables.py:60 msgid "Disable Users" msgstr "" -#: dashboards/syspanel/users/tables.py:69 +#: dashboards/syspanel/users/tables.py:71 msgid "You cannot disable the user you are currently logged in as." msgstr "" -#: dashboards/syspanel/users/tables.py:77 +#: dashboards/syspanel/users/tables.py:79 #, python-format msgid "Error disabling user: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:80 +#: dashboards/syspanel/users/tables.py:82 #, python-format msgid "Disabled the following users: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:84 +#: dashboards/syspanel/users/tables.py:86 #, python-format msgid "Successfully disabled users: %s" msgstr "" @@ -2037,26 +2038,26 @@ msgstr "" msgid "Unable to update user." msgstr "" -#: tables/actions.py:431 +#: tables/actions.py:451 #, python-format msgid "You do not have permission to %(action)s: %(objs)s" msgstr "" -#: tables/actions.py:437 +#: tables/actions.py:457 #, python-format msgid "Unable to %(action)s: %(objs)s" msgstr "" -#: tables/actions.py:443 +#: tables/actions.py:463 #, python-format msgid "%(action)s: %(objs)s" msgstr "" -#: tables/actions.py:453 +#: tables/actions.py:473 msgid "Delete" msgstr "" -#: tables/actions.py:454 +#: tables/actions.py:474 msgid "Deleted" msgstr "" @@ -2224,23 +2225,23 @@ msgstr "" msgid "Download CSV Summary" msgstr "" -#: usage/tables.py:22 +#: usage/tables.py:23 msgid "VCPU Hours" msgstr "" -#: usage/tables.py:27 +#: usage/tables.py:28 msgid "Project ID" msgstr "" -#: usage/tables.py:29 +#: usage/tables.py:30 msgid "Disk GB Hours" msgstr "" -#: usage/tables.py:37 usage/tables.py:55 +#: usage/tables.py:38 usage/tables.py:56 msgid "Usage Summary" msgstr "" -#: usage/tables.py:47 +#: usage/tables.py:48 msgid "Uptime" msgstr "" diff --git a/horizon/locale/ja/LC_MESSAGES/django.po b/horizon/locale/ja/LC_MESSAGES/django.po index e17ab89f9..d444bb05f 100644 --- a/horizon/locale/ja/LC_MESSAGES/django.po +++ b/horizon/locale/ja/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: openstack-dashboard\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-14 13:53-0700\n" +"POT-Creation-Date: 2012-03-14 14:44-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Takeshi Nakajima \n" "Language-Team: LANGUAGE \n" @@ -68,12 +68,12 @@ msgid "Error fetching floating ips: %s" msgstr "" #: dashboards/nova/access_and_security/floating_ips/forms.py:48 -#: dashboards/nova/access_and_security/floating_ips/tables.py:92 +#: dashboards/nova/access_and_security/floating_ips/tables.py:93 #: dashboards/nova/instances_and_volumes/instances/tables.py:56 #: dashboards/nova/instances_and_volumes/instances/tables.py:68 #: dashboards/nova/instances_and_volumes/instances/tables.py:83 -#: dashboards/nova/instances_and_volumes/instances/tables.py:108 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:168 +#: dashboards/nova/instances_and_volumes/instances/tables.py:109 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:167 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:42 #, fuzzy msgid "Instance" @@ -121,7 +121,7 @@ msgid "Floating IP" msgstr "" #: dashboards/nova/access_and_security/floating_ips/tables.py:47 -#: dashboards/nova/access_and_security/floating_ips/tables.py:106 +#: dashboards/nova/access_and_security/floating_ips/tables.py:107 #: dashboards/syspanel/projects/forms.py:119 msgid "Floating IPs" msgstr "" @@ -135,23 +135,23 @@ msgstr "" msgid "Disassociate IP" msgstr "" -#: dashboards/nova/access_and_security/floating_ips/tables.py:81 +#: dashboards/nova/access_and_security/floating_ips/tables.py:82 #, python-format msgid "Successfully disassociated Floating IP: %s" msgstr "" -#: dashboards/nova/access_and_security/floating_ips/tables.py:85 +#: dashboards/nova/access_and_security/floating_ips/tables.py:86 #, fuzzy msgid "Unable to disassociate floating IP." msgstr "イメージ%sを更新できません。" -#: dashboards/nova/access_and_security/floating_ips/tables.py:90 -#: dashboards/nova/instances_and_volumes/instances/tables.py:214 +#: dashboards/nova/access_and_security/floating_ips/tables.py:91 +#: dashboards/nova/instances_and_volumes/instances/tables.py:219 #: dashboards/syspanel/instances/tables.py:49 msgid "IP Address" msgstr "" -#: dashboards/nova/access_and_security/floating_ips/tables.py:95 +#: dashboards/nova/access_and_security/floating_ips/tables.py:96 msgid "Floating IP Pool" msgstr "" @@ -345,12 +345,12 @@ msgstr "ユーザ資格の編集" #: dashboards/nova/access_and_security/security_groups/tables.py:57 #: dashboards/nova/images_and_snapshots/images/forms.py:42 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:120 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:137 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:119 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:136 #: dashboards/syspanel/flavors/forms.py:37 #: dashboards/syspanel/projects/forms.py:60 #: dashboards/syspanel/projects/forms.py:85 -#: dashboards/syspanel/projects/tables.py:72 +#: dashboards/syspanel/projects/tables.py:74 #: dashboards/syspanel/users/forms.py:63 msgid "Name" msgstr "名前" @@ -358,7 +358,7 @@ msgstr "名前" #: dashboards/nova/access_and_security/security_groups/tables.py:58 #: dashboards/nova/instances_and_volumes/volumes/forms.py:29 #: dashboards/nova/instances_and_volumes/volumes/forms.py:93 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:123 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:122 #: dashboards/nova/templates/nova/access_and_security/keypairs/_create.html:16 #: dashboards/nova/templates/nova/access_and_security/keypairs/_import.html:16 #: dashboards/nova/templates/nova/access_and_security/security_groups/_create.html:17 @@ -369,7 +369,7 @@ msgstr "名前" #: dashboards/nova/templates/nova/objects/_upload.html:17 #: dashboards/syspanel/projects/forms.py:63 #: dashboards/syspanel/projects/forms.py:88 -#: dashboards/syspanel/projects/tables.py:74 +#: dashboards/syspanel/projects/tables.py:76 #: dashboards/syspanel/templates/syspanel/flavors/_create.html:17 #: dashboards/syspanel/templates/syspanel/images/_update.html:17 #: dashboards/syspanel/templates/syspanel/projects/_add_user.html:17 @@ -433,7 +433,7 @@ msgid "Unable to create container." msgstr "キー%sを作成できません。" #: dashboards/nova/containers/forms.py:59 -#: dashboards/nova/containers/tables.py:169 +#: dashboards/nova/containers/tables.py:170 #, fuzzy msgid "Object Name" msgstr "ユーザ名" @@ -470,34 +470,34 @@ msgid "Unable to copy object." msgstr "" #: dashboards/nova/containers/panel.py:28 -#: dashboards/nova/containers/tables.py:37 +#: dashboards/nova/containers/tables.py:36 #: dashboards/nova/containers/tables.py:114 #: dashboards/nova/templates/nova/containers/index.html:8 msgid "Containers" msgstr "" -#: dashboards/nova/containers/tables.py:36 +#: dashboards/nova/containers/tables.py:35 #, fuzzy msgid "Container" msgstr "ユーザ名" -#: dashboards/nova/containers/tables.py:53 +#: dashboards/nova/containers/tables.py:52 #, fuzzy, python-format msgid "Unable to delete non-empty container: %s" msgstr "キー%sを削除できません。" -#: dashboards/nova/containers/tables.py:57 +#: dashboards/nova/containers/tables.py:56 #, fuzzy, python-format msgid "Successfully deleted containers: %s" msgstr "プロジェクト%(proj)sを正常に修正しました。" -#: dashboards/nova/containers/tables.py:64 +#: dashboards/nova/containers/tables.py:63 #: dashboards/nova/templates/nova/containers/_create.html:22 #: dashboards/nova/templates/nova/containers/create.html:6 msgid "Create Container" msgstr "" -#: dashboards/nova/containers/tables.py:71 +#: dashboards/nova/containers/tables.py:70 msgid "List Objects" msgstr "" @@ -508,15 +508,15 @@ msgstr "" #: dashboards/nova/containers/tables.py:105 #: dashboards/nova/containers/tables.py:121 -#: dashboards/nova/containers/tables.py:177 +#: dashboards/nova/containers/tables.py:178 #, fuzzy msgid "Objects" msgstr "ユーザ名" #: dashboards/nova/containers/tables.py:107 -#: dashboards/nova/containers/tables.py:170 -#: dashboards/nova/instances_and_volumes/instances/tables.py:215 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:124 +#: dashboards/nova/containers/tables.py:171 +#: dashboards/nova/instances_and_volumes/instances/tables.py:220 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:123 #: dashboards/syspanel/instances/tables.py:50 msgid "Size" msgstr "" @@ -713,8 +713,8 @@ msgid "Image Name" msgstr "ユーザ名" #: dashboards/nova/images_and_snapshots/images/tables.py:76 -#: dashboards/nova/instances_and_volumes/instances/tables.py:218 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:127 +#: dashboards/nova/instances_and_volumes/instances/tables.py:223 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:126 #: dashboards/nova/templates/nova/images_and_snapshots/images/detail.html:12 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:6 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:9 @@ -757,13 +757,13 @@ msgstr "言語を選択" #: dashboards/nova/images_and_snapshots/images/views.py:115 #: dashboards/nova/images_and_snapshots/snapshots/tables.py:28 -#: dashboards/nova/instances_and_volumes/instances/tables.py:144 +#: dashboards/nova/instances_and_volumes/instances/tables.py:147 msgid "Snapshot" msgstr "スナップショット" #: dashboards/nova/images_and_snapshots/images/views.py:118 #: dashboards/nova/instances_and_volumes/volumes/tables.py:35 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:155 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:154 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:74 #, fuzzy msgid "Volume" @@ -822,12 +822,12 @@ msgid "Volume Snapshot" msgstr "スナップショット" #: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:31 -#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:43 +#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:42 #, fuzzy msgid "Volume Snapshots" msgstr "スナップショット" -#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:39 +#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:38 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:10 #, fuzzy msgid "Volume ID" @@ -871,8 +871,8 @@ msgstr "削除" #: dashboards/nova/instances_and_volumes/instances/tables.py:57 #: dashboards/nova/instances_and_volumes/instances/tables.py:69 #: dashboards/nova/instances_and_volumes/instances/tables.py:84 -#: dashboards/nova/instances_and_volumes/instances/tables.py:109 -#: dashboards/nova/instances_and_volumes/instances/tables.py:232 +#: dashboards/nova/instances_and_volumes/instances/tables.py:110 +#: dashboards/nova/instances_and_volumes/instances/tables.py:237 #: dashboards/syspanel/instances/tables.py:67 #: dashboards/syspanel/projects/forms.py:115 #: dashboards/syspanel/templates/syspanel/instances/index.html:3 @@ -904,63 +904,63 @@ msgstr "" msgid "Unpaused" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:106 +#: dashboards/nova/instances_and_volumes/instances/tables.py:107 msgid "Suspend" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:106 +#: dashboards/nova/instances_and_volumes/instances/tables.py:107 msgid "Resume" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:107 +#: dashboards/nova/instances_and_volumes/instances/tables.py:108 msgid "Suspended" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:107 +#: dashboards/nova/instances_and_volumes/instances/tables.py:108 msgid "Resumed" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:131 +#: dashboards/nova/instances_and_volumes/instances/tables.py:133 #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:53 #: dashboards/nova/templates/nova/images_and_snapshots/images/launch.html:13 msgid "Launch Instance" msgstr "イメージを起動します。" -#: dashboards/nova/instances_and_volumes/instances/tables.py:137 +#: dashboards/nova/instances_and_volumes/instances/tables.py:140 msgid "Edit Instance" msgstr "インスタンスを編集" -#: dashboards/nova/instances_and_volumes/instances/tables.py:154 +#: dashboards/nova/instances_and_volumes/instances/tables.py:157 msgid "VNC Console" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:163 +#: dashboards/nova/instances_and_volumes/instances/tables.py:167 msgid "View Log" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:190 +#: dashboards/nova/instances_and_volumes/instances/tables.py:195 #, python-format msgid "%(RAM)s RAM | %(VCPU)s VCPU | %(disk)s Disk" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:195 +#: dashboards/nova/instances_and_volumes/instances/tables.py:200 #, fuzzy msgid "Not available" msgstr "現在イメージがありません。" -#: dashboards/nova/instances_and_volumes/instances/tables.py:213 +#: dashboards/nova/instances_and_volumes/instances/tables.py:218 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:10 -#: dashboards/syspanel/instances/tables.py:48 usage/tables.py:45 +#: dashboards/syspanel/instances/tables.py:48 usage/tables.py:46 #, fuzzy msgid "Instance Name" msgstr "インスタンス" -#: dashboards/nova/instances_and_volumes/instances/tables.py:222 +#: dashboards/nova/instances_and_volumes/instances/tables.py:227 #: dashboards/syspanel/instances/tables.py:57 msgid "Task" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:228 +#: dashboards/nova/instances_and_volumes/instances/tables.py:233 #: dashboards/syspanel/instances/tables.py:63 #, fuzzy msgid "Power State" @@ -1030,52 +1030,52 @@ msgid "Error Creating Volume Snapshot: %(exc)s" msgstr "ユーザ%sを作成中..." #: dashboards/nova/instances_and_volumes/volumes/tables.py:36 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:144 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:156 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:143 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:155 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:68 #: dashboards/syspanel/projects/forms.py:116 msgid "Volumes" msgstr "ボリューム" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:53 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:52 msgid "Volumes in error states cannot be deleted via the Nova API." msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:59 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:58 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_create.html:23 #, fuzzy msgid "Create Volume" msgstr "作成" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:66 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:65 #, fuzzy msgid "Edit Attachments" msgstr "ボリュームを付与する。" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:76 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:75 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html:8 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html:23 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/create.html:3 msgid "Create Snapshot" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:94 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:93 #: templatetags/sizeformat.py:58 #, python-format msgid "%s GB" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:140 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:139 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:35 #, fuzzy msgid "Attachments" msgstr "ボリュームを付与する。" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:153 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:152 msgid "Detach" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:154 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:153 msgid "Detached" msgstr "" @@ -1256,13 +1256,13 @@ msgstr "" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:20 #: dashboards/syspanel/flavors/forms.py:38 #: dashboards/syspanel/flavors/tables.py:30 -#: dashboards/syspanel/projects/forms.py:114 usage/tables.py:17 +#: dashboards/syspanel/projects/forms.py:114 usage/tables.py:18 msgid "VCPUs" msgstr "" #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:37 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:21 -#: usage/tables.py:18 +#: usage/tables.py:19 msgid "Disk" msgstr "" @@ -1414,7 +1414,7 @@ msgid "Instance ID" msgstr "インスタンスID:" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:19 -#: usage/tables.py:20 +#: usage/tables.py:21 msgid "RAM" msgstr "" @@ -1588,12 +1588,12 @@ msgstr "プロジェクトを削除" msgid "Unable to retrieve tenant list." msgstr "キー%sを作成できません。" -#: dashboards/settings/ec2/forms.py:71 +#: dashboards/settings/ec2/forms.py:85 #, fuzzy msgid "Unable to fetch EC2 credentials." msgstr "X509資格情報生成する。" -#: dashboards/settings/ec2/forms.py:84 +#: dashboards/settings/ec2/forms.py:98 #, fuzzy, python-format msgid "Error writing zipfile: %(exc)s" msgstr "ユーザ%sを作成中..." @@ -1613,13 +1613,14 @@ msgstr "イメージ%sを更新できません。" #: dashboards/settings/templates/settings/ec2/index.html:3 #: dashboards/settings/templates/settings/ec2/index.html:6 #, fuzzy -msgid "Download x509 Credentials" +msgid "Download EC2 Credentials" msgstr "認証情報を送信" #: dashboards/settings/templates/settings/ec2/download_form.html:18 msgid "" -"Clicking \"Download x509 Credentials\" will download a zip file which " -"contains your x509 private key and certificate." +"Clicking \"Download EC2 Credentials\" will download a zip file which " +"includes an rc file with your access/secret keys, as well as your x509 " +"private key and certificate." msgstr "" #: dashboards/settings/templates/settings/project/_openrc.html:8 @@ -1736,8 +1737,8 @@ msgid "Tenant" msgstr "テナント" #: dashboards/syspanel/instances/tables.py:42 -#: dashboards/syspanel/projects/tables.py:89 -#: dashboards/syspanel/users/tables.py:90 +#: dashboards/syspanel/projects/tables.py:91 +#: dashboards/syspanel/users/tables.py:92 msgid "User" msgstr "" @@ -1762,9 +1763,9 @@ msgstr "キー%sを作成できません。" #: dashboards/syspanel/projects/forms.py:64 #: dashboards/syspanel/projects/forms.py:89 -#: dashboards/syspanel/projects/tables.py:75 +#: dashboards/syspanel/projects/tables.py:77 #: dashboards/syspanel/services/tables.py:51 -#: dashboards/syspanel/users/tables.py:127 +#: dashboards/syspanel/users/tables.py:129 msgid "Enabled" msgstr "" @@ -1780,7 +1781,7 @@ msgstr "キー%sを作成できません。" #: dashboards/syspanel/projects/forms.py:83 #: dashboards/syspanel/users/forms.py:105 -#: dashboards/syspanel/users/tables.py:121 +#: dashboards/syspanel/users/tables.py:123 msgid "ID" msgstr "" @@ -1836,64 +1837,64 @@ msgstr "" msgid "Modify Users" msgstr "" -#: dashboards/syspanel/projects/tables.py:30 +#: dashboards/syspanel/projects/tables.py:31 msgid "View Usage" msgstr "" -#: dashboards/syspanel/projects/tables.py:36 +#: dashboards/syspanel/projects/tables.py:38 #, fuzzy msgid "Edit Project" msgstr "プロジェクトを削除" -#: dashboards/syspanel/projects/tables.py:43 +#: dashboards/syspanel/projects/tables.py:45 #, fuzzy msgid "Create New Project" msgstr "新規ボリュームを作成する。" -#: dashboards/syspanel/projects/tables.py:49 +#: dashboards/syspanel/projects/tables.py:51 #, fuzzy msgid "Project" msgstr "プロジェクトを削除" -#: dashboards/syspanel/projects/tables.py:50 -#: dashboards/syspanel/projects/tables.py:79 +#: dashboards/syspanel/projects/tables.py:52 +#: dashboards/syspanel/projects/tables.py:81 #: dashboards/syspanel/templates/syspanel/projects/index.html:8 #, fuzzy msgid "Projects" msgstr "プロジェクトを削除" -#: dashboards/syspanel/projects/tables.py:71 +#: dashboards/syspanel/projects/tables.py:73 #: dashboards/syspanel/services/tables.py:47 msgid "Id" msgstr "" -#: dashboards/syspanel/projects/tables.py:87 +#: dashboards/syspanel/projects/tables.py:89 #, fuzzy msgid "Remove" msgstr "イメージを削除する" -#: dashboards/syspanel/projects/tables.py:88 +#: dashboards/syspanel/projects/tables.py:90 #, fuzzy msgid "Removed" msgstr "イメージを削除する" -#: dashboards/syspanel/projects/tables.py:90 +#: dashboards/syspanel/projects/tables.py:92 #: dashboards/syspanel/templates/syspanel/users/index.html:8 -#: dashboards/syspanel/users/tables.py:91 -#: dashboards/syspanel/users/tables.py:133 +#: dashboards/syspanel/users/tables.py:93 +#: dashboards/syspanel/users/tables.py:135 msgid "Users" msgstr "ユーザー" -#: dashboards/syspanel/projects/tables.py:101 +#: dashboards/syspanel/projects/tables.py:103 #, fuzzy msgid "Users For Project" msgstr "プロジェクトからユーザを削除します。" -#: dashboards/syspanel/projects/tables.py:108 +#: dashboards/syspanel/projects/tables.py:110 msgid "Add To Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:120 +#: dashboards/syspanel/projects/tables.py:122 #, fuzzy msgid "Add New Users" msgstr "新規ボリュームを作成する。" @@ -1913,15 +1914,15 @@ msgstr "%sをリボーク(無効化)できません。" msgid "Unable to retrieve roles." msgstr "ボリューム%sを作成できません。" -#: dashboards/syspanel/quotas/tables.py:27 +#: dashboards/syspanel/quotas/tables.py:24 msgid "Quota Name" msgstr "" -#: dashboards/syspanel/quotas/tables.py:28 +#: dashboards/syspanel/quotas/tables.py:25 msgid "Limit" msgstr "" -#: dashboards/syspanel/quotas/tables.py:35 +#: dashboards/syspanel/quotas/tables.py:32 msgid "Quotas" msgstr "クォータ" @@ -2068,7 +2069,7 @@ msgstr "" #: dashboards/syspanel/users/forms.py:64 #: dashboards/syspanel/users/forms.py:107 -#: dashboards/syspanel/users/tables.py:123 +#: dashboards/syspanel/users/tables.py:125 msgid "Email" msgstr "" @@ -2105,7 +2106,7 @@ msgid "Unable to create user." msgstr "ボリューム%sを作成できません。" #: dashboards/syspanel/users/forms.py:106 -#: dashboards/syspanel/users/tables.py:122 views/auth_forms.py:64 +#: dashboards/syspanel/users/tables.py:124 views/auth_forms.py:64 msgid "User Name" msgstr "ユーザ名" @@ -2146,44 +2147,44 @@ msgstr "" msgid "Enable Users" msgstr "イメージを更新" -#: dashboards/syspanel/users/tables.py:45 +#: dashboards/syspanel/users/tables.py:46 #, fuzzy, python-format msgid "Error enabling user: %s" msgstr "ユーザ%sを作成中..." -#: dashboards/syspanel/users/tables.py:48 +#: dashboards/syspanel/users/tables.py:49 #, fuzzy, python-format msgid "Enabled the following users: %s" msgstr "キー%sを削除できません。" -#: dashboards/syspanel/users/tables.py:51 +#: dashboards/syspanel/users/tables.py:52 #, fuzzy, python-format msgid "Successfully enabled users: %s" msgstr "プロジェクト%(proj)sを正常に修正しました。" -#: dashboards/syspanel/users/tables.py:58 +#: dashboards/syspanel/users/tables.py:59 msgid "Disable" msgstr "" -#: dashboards/syspanel/users/tables.py:59 +#: dashboards/syspanel/users/tables.py:60 msgid "Disable Users" msgstr "" -#: dashboards/syspanel/users/tables.py:69 +#: dashboards/syspanel/users/tables.py:71 msgid "You cannot disable the user you are currently logged in as." msgstr "" -#: dashboards/syspanel/users/tables.py:77 +#: dashboards/syspanel/users/tables.py:79 #, fuzzy, python-format msgid "Error disabling user: %s" msgstr "ユーザ%sを作成中..." -#: dashboards/syspanel/users/tables.py:80 +#: dashboards/syspanel/users/tables.py:82 #, fuzzy, python-format msgid "Disabled the following users: %s" msgstr "キー%sを削除できません。" -#: dashboards/syspanel/users/tables.py:84 +#: dashboards/syspanel/users/tables.py:86 #, fuzzy, python-format msgid "Successfully disabled users: %s" msgstr "プロジェクト%(proj)sを正常に修正しました。" @@ -2198,26 +2199,26 @@ msgstr "イメージ%sを公開できません。" msgid "Unable to update user." msgstr "イメージ%sを更新できません。" -#: tables/actions.py:431 +#: tables/actions.py:451 #, python-format msgid "You do not have permission to %(action)s: %(objs)s" msgstr "" -#: tables/actions.py:437 +#: tables/actions.py:457 #, fuzzy, python-format msgid "Unable to %(action)s: %(objs)s" msgstr "キー%sを削除できません。" -#: tables/actions.py:443 +#: tables/actions.py:463 #, python-format msgid "%(action)s: %(objs)s" msgstr "" -#: tables/actions.py:453 +#: tables/actions.py:473 msgid "Delete" msgstr "削除" -#: tables/actions.py:454 +#: tables/actions.py:474 #, fuzzy msgid "Deleted" msgstr "削除" @@ -2387,23 +2388,23 @@ msgstr "" msgid "Download CSV Summary" msgstr "" -#: usage/tables.py:22 +#: usage/tables.py:23 msgid "VCPU Hours" msgstr "" -#: usage/tables.py:27 +#: usage/tables.py:28 msgid "Project ID" msgstr "" -#: usage/tables.py:29 +#: usage/tables.py:30 msgid "Disk GB Hours" msgstr "" -#: usage/tables.py:37 usage/tables.py:55 +#: usage/tables.py:38 usage/tables.py:56 msgid "Usage Summary" msgstr "" -#: usage/tables.py:47 +#: usage/tables.py:48 msgid "Uptime" msgstr "" diff --git a/horizon/locale/pl/LC_MESSAGES/django.po b/horizon/locale/pl/LC_MESSAGES/django.po index 540f3c813..af45a52da 100644 --- a/horizon/locale/pl/LC_MESSAGES/django.po +++ b/horizon/locale/pl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: openstack-dashboard\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-14 13:53-0700\n" +"POT-Creation-Date: 2012-03-14 14:44-0700\n" "PO-Revision-Date: 2011-09-24 14:41+0100\n" "Last-Translator: Tomasz 'Zen' Napierala \n" "Language-Team: Polish OpenStack translations team \n" "Language-Team: LANGUAGE \n" @@ -65,12 +65,12 @@ msgid "Error fetching floating ips: %s" msgstr "" #: dashboards/nova/access_and_security/floating_ips/forms.py:48 -#: dashboards/nova/access_and_security/floating_ips/tables.py:92 +#: dashboards/nova/access_and_security/floating_ips/tables.py:93 #: dashboards/nova/instances_and_volumes/instances/tables.py:56 #: dashboards/nova/instances_and_volumes/instances/tables.py:68 #: dashboards/nova/instances_and_volumes/instances/tables.py:83 -#: dashboards/nova/instances_and_volumes/instances/tables.py:108 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:168 +#: dashboards/nova/instances_and_volumes/instances/tables.py:109 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:167 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:42 msgid "Instance" msgstr "" @@ -114,7 +114,7 @@ msgid "Floating IP" msgstr "" #: dashboards/nova/access_and_security/floating_ips/tables.py:47 -#: dashboards/nova/access_and_security/floating_ips/tables.py:106 +#: dashboards/nova/access_and_security/floating_ips/tables.py:107 #: dashboards/syspanel/projects/forms.py:119 msgid "Floating IPs" msgstr "" @@ -128,22 +128,22 @@ msgstr "" msgid "Disassociate IP" msgstr "" -#: dashboards/nova/access_and_security/floating_ips/tables.py:81 +#: dashboards/nova/access_and_security/floating_ips/tables.py:82 #, python-format msgid "Successfully disassociated Floating IP: %s" msgstr "" -#: dashboards/nova/access_and_security/floating_ips/tables.py:85 +#: dashboards/nova/access_and_security/floating_ips/tables.py:86 msgid "Unable to disassociate floating IP." msgstr "" -#: dashboards/nova/access_and_security/floating_ips/tables.py:90 -#: dashboards/nova/instances_and_volumes/instances/tables.py:214 +#: dashboards/nova/access_and_security/floating_ips/tables.py:91 +#: dashboards/nova/instances_and_volumes/instances/tables.py:219 #: dashboards/syspanel/instances/tables.py:49 msgid "IP Address" msgstr "" -#: dashboards/nova/access_and_security/floating_ips/tables.py:95 +#: dashboards/nova/access_and_security/floating_ips/tables.py:96 msgid "Floating IP Pool" msgstr "" @@ -328,12 +328,12 @@ msgstr "" #: dashboards/nova/access_and_security/security_groups/tables.py:57 #: dashboards/nova/images_and_snapshots/images/forms.py:42 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:120 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:137 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:119 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:136 #: dashboards/syspanel/flavors/forms.py:37 #: dashboards/syspanel/projects/forms.py:60 #: dashboards/syspanel/projects/forms.py:85 -#: dashboards/syspanel/projects/tables.py:72 +#: dashboards/syspanel/projects/tables.py:74 #: dashboards/syspanel/users/forms.py:63 msgid "Name" msgstr "" @@ -341,7 +341,7 @@ msgstr "" #: dashboards/nova/access_and_security/security_groups/tables.py:58 #: dashboards/nova/instances_and_volumes/volumes/forms.py:29 #: dashboards/nova/instances_and_volumes/volumes/forms.py:93 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:123 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:122 #: dashboards/nova/templates/nova/access_and_security/keypairs/_create.html:16 #: dashboards/nova/templates/nova/access_and_security/keypairs/_import.html:16 #: dashboards/nova/templates/nova/access_and_security/security_groups/_create.html:17 @@ -352,7 +352,7 @@ msgstr "" #: dashboards/nova/templates/nova/objects/_upload.html:17 #: dashboards/syspanel/projects/forms.py:63 #: dashboards/syspanel/projects/forms.py:88 -#: dashboards/syspanel/projects/tables.py:74 +#: dashboards/syspanel/projects/tables.py:76 #: dashboards/syspanel/templates/syspanel/flavors/_create.html:17 #: dashboards/syspanel/templates/syspanel/images/_update.html:17 #: dashboards/syspanel/templates/syspanel/projects/_add_user.html:17 @@ -410,7 +410,7 @@ msgid "Unable to create container." msgstr "" #: dashboards/nova/containers/forms.py:59 -#: dashboards/nova/containers/tables.py:169 +#: dashboards/nova/containers/tables.py:170 msgid "Object Name" msgstr "" @@ -444,33 +444,33 @@ msgid "Unable to copy object." msgstr "" #: dashboards/nova/containers/panel.py:28 -#: dashboards/nova/containers/tables.py:37 +#: dashboards/nova/containers/tables.py:36 #: dashboards/nova/containers/tables.py:114 #: dashboards/nova/templates/nova/containers/index.html:8 msgid "Containers" msgstr "" -#: dashboards/nova/containers/tables.py:36 +#: dashboards/nova/containers/tables.py:35 msgid "Container" msgstr "" -#: dashboards/nova/containers/tables.py:53 +#: dashboards/nova/containers/tables.py:52 #, python-format msgid "Unable to delete non-empty container: %s" msgstr "" -#: dashboards/nova/containers/tables.py:57 +#: dashboards/nova/containers/tables.py:56 #, python-format msgid "Successfully deleted containers: %s" msgstr "" -#: dashboards/nova/containers/tables.py:64 +#: dashboards/nova/containers/tables.py:63 #: dashboards/nova/templates/nova/containers/_create.html:22 #: dashboards/nova/templates/nova/containers/create.html:6 msgid "Create Container" msgstr "" -#: dashboards/nova/containers/tables.py:71 +#: dashboards/nova/containers/tables.py:70 msgid "List Objects" msgstr "" @@ -481,14 +481,14 @@ msgstr "" #: dashboards/nova/containers/tables.py:105 #: dashboards/nova/containers/tables.py:121 -#: dashboards/nova/containers/tables.py:177 +#: dashboards/nova/containers/tables.py:178 msgid "Objects" msgstr "" #: dashboards/nova/containers/tables.py:107 -#: dashboards/nova/containers/tables.py:170 -#: dashboards/nova/instances_and_volumes/instances/tables.py:215 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:124 +#: dashboards/nova/containers/tables.py:171 +#: dashboards/nova/instances_and_volumes/instances/tables.py:220 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:123 #: dashboards/syspanel/instances/tables.py:50 msgid "Size" msgstr "" @@ -665,8 +665,8 @@ msgid "Image Name" msgstr "" #: dashboards/nova/images_and_snapshots/images/tables.py:76 -#: dashboards/nova/instances_and_volumes/instances/tables.py:218 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:127 +#: dashboards/nova/instances_and_volumes/instances/tables.py:223 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:126 #: dashboards/nova/templates/nova/images_and_snapshots/images/detail.html:12 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:6 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:9 @@ -704,13 +704,13 @@ msgstr "" #: dashboards/nova/images_and_snapshots/images/views.py:115 #: dashboards/nova/images_and_snapshots/snapshots/tables.py:28 -#: dashboards/nova/instances_and_volumes/instances/tables.py:144 +#: dashboards/nova/instances_and_volumes/instances/tables.py:147 msgid "Snapshot" msgstr "" #: dashboards/nova/images_and_snapshots/images/views.py:118 #: dashboards/nova/instances_and_volumes/volumes/tables.py:35 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:155 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:154 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:74 msgid "Volume" msgstr "" @@ -762,11 +762,11 @@ msgid "Volume Snapshot" msgstr "" #: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:31 -#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:43 +#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:42 msgid "Volume Snapshots" msgstr "" -#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:39 +#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:38 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:10 msgid "Volume ID" msgstr "" @@ -805,8 +805,8 @@ msgstr "" #: dashboards/nova/instances_and_volumes/instances/tables.py:57 #: dashboards/nova/instances_and_volumes/instances/tables.py:69 #: dashboards/nova/instances_and_volumes/instances/tables.py:84 -#: dashboards/nova/instances_and_volumes/instances/tables.py:109 -#: dashboards/nova/instances_and_volumes/instances/tables.py:232 +#: dashboards/nova/instances_and_volumes/instances/tables.py:110 +#: dashboards/nova/instances_and_volumes/instances/tables.py:237 #: dashboards/syspanel/instances/tables.py:67 #: dashboards/syspanel/projects/forms.py:115 #: dashboards/syspanel/templates/syspanel/instances/index.html:3 @@ -837,61 +837,61 @@ msgstr "" msgid "Unpaused" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:106 +#: dashboards/nova/instances_and_volumes/instances/tables.py:107 msgid "Suspend" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:106 +#: dashboards/nova/instances_and_volumes/instances/tables.py:107 msgid "Resume" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:107 +#: dashboards/nova/instances_and_volumes/instances/tables.py:108 msgid "Suspended" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:107 +#: dashboards/nova/instances_and_volumes/instances/tables.py:108 msgid "Resumed" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:131 +#: dashboards/nova/instances_and_volumes/instances/tables.py:133 #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:53 #: dashboards/nova/templates/nova/images_and_snapshots/images/launch.html:13 msgid "Launch Instance" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:137 +#: dashboards/nova/instances_and_volumes/instances/tables.py:140 msgid "Edit Instance" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:154 +#: dashboards/nova/instances_and_volumes/instances/tables.py:157 msgid "VNC Console" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:163 +#: dashboards/nova/instances_and_volumes/instances/tables.py:167 msgid "View Log" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:190 +#: dashboards/nova/instances_and_volumes/instances/tables.py:195 #, python-format msgid "%(RAM)s RAM | %(VCPU)s VCPU | %(disk)s Disk" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:195 +#: dashboards/nova/instances_and_volumes/instances/tables.py:200 msgid "Not available" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:213 +#: dashboards/nova/instances_and_volumes/instances/tables.py:218 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:10 -#: dashboards/syspanel/instances/tables.py:48 usage/tables.py:45 +#: dashboards/syspanel/instances/tables.py:48 usage/tables.py:46 msgid "Instance Name" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:222 +#: dashboards/nova/instances_and_volumes/instances/tables.py:227 #: dashboards/syspanel/instances/tables.py:57 msgid "Task" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:228 +#: dashboards/nova/instances_and_volumes/instances/tables.py:233 #: dashboards/syspanel/instances/tables.py:63 msgid "Power State" msgstr "" @@ -959,49 +959,49 @@ msgid "Error Creating Volume Snapshot: %(exc)s" msgstr "" #: dashboards/nova/instances_and_volumes/volumes/tables.py:36 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:144 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:156 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:143 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:155 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:68 #: dashboards/syspanel/projects/forms.py:116 msgid "Volumes" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:53 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:52 msgid "Volumes in error states cannot be deleted via the Nova API." msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:59 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:58 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_create.html:23 msgid "Create Volume" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:66 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:65 msgid "Edit Attachments" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:76 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:75 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html:8 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html:23 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/create.html:3 msgid "Create Snapshot" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:94 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:93 #: templatetags/sizeformat.py:58 #, python-format msgid "%s GB" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:140 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:139 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:35 msgid "Attachments" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:153 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:152 msgid "Detach" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:154 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:153 msgid "Detached" msgstr "" @@ -1170,13 +1170,13 @@ msgstr "" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:20 #: dashboards/syspanel/flavors/forms.py:38 #: dashboards/syspanel/flavors/tables.py:30 -#: dashboards/syspanel/projects/forms.py:114 usage/tables.py:17 +#: dashboards/syspanel/projects/forms.py:114 usage/tables.py:18 msgid "VCPUs" msgstr "" #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:37 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:21 -#: usage/tables.py:18 +#: usage/tables.py:19 msgid "Disk" msgstr "" @@ -1317,7 +1317,7 @@ msgid "Instance ID" msgstr "" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:19 -#: usage/tables.py:20 +#: usage/tables.py:21 msgid "RAM" msgstr "" @@ -1473,11 +1473,11 @@ msgstr "" msgid "Unable to retrieve tenant list." msgstr "" -#: dashboards/settings/ec2/forms.py:71 +#: dashboards/settings/ec2/forms.py:85 msgid "Unable to fetch EC2 credentials." msgstr "" -#: dashboards/settings/ec2/forms.py:84 +#: dashboards/settings/ec2/forms.py:98 #, python-format msgid "Error writing zipfile: %(exc)s" msgstr "" @@ -1495,13 +1495,14 @@ msgstr "" #: dashboards/settings/templates/settings/ec2/download_form.html:23 #: dashboards/settings/templates/settings/ec2/index.html:3 #: dashboards/settings/templates/settings/ec2/index.html:6 -msgid "Download x509 Credentials" +msgid "Download EC2 Credentials" msgstr "" #: dashboards/settings/templates/settings/ec2/download_form.html:18 msgid "" -"Clicking \"Download x509 Credentials\" will download a zip file which " -"contains your x509 private key and certificate." +"Clicking \"Download EC2 Credentials\" will download a zip file which " +"includes an rc file with your access/secret keys, as well as your x509 " +"private key and certificate." msgstr "" #: dashboards/settings/templates/settings/project/_openrc.html:8 @@ -1611,8 +1612,8 @@ msgid "Tenant" msgstr "" #: dashboards/syspanel/instances/tables.py:42 -#: dashboards/syspanel/projects/tables.py:89 -#: dashboards/syspanel/users/tables.py:90 +#: dashboards/syspanel/projects/tables.py:91 +#: dashboards/syspanel/users/tables.py:92 msgid "User" msgstr "" @@ -1635,9 +1636,9 @@ msgstr "" #: dashboards/syspanel/projects/forms.py:64 #: dashboards/syspanel/projects/forms.py:89 -#: dashboards/syspanel/projects/tables.py:75 +#: dashboards/syspanel/projects/tables.py:77 #: dashboards/syspanel/services/tables.py:51 -#: dashboards/syspanel/users/tables.py:127 +#: dashboards/syspanel/users/tables.py:129 msgid "Enabled" msgstr "" @@ -1652,7 +1653,7 @@ msgstr "" #: dashboards/syspanel/projects/forms.py:83 #: dashboards/syspanel/users/forms.py:105 -#: dashboards/syspanel/users/tables.py:121 +#: dashboards/syspanel/users/tables.py:123 msgid "ID" msgstr "" @@ -1706,57 +1707,57 @@ msgstr "" msgid "Modify Users" msgstr "" -#: dashboards/syspanel/projects/tables.py:30 +#: dashboards/syspanel/projects/tables.py:31 msgid "View Usage" msgstr "" -#: dashboards/syspanel/projects/tables.py:36 +#: dashboards/syspanel/projects/tables.py:38 msgid "Edit Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:43 +#: dashboards/syspanel/projects/tables.py:45 msgid "Create New Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:49 +#: dashboards/syspanel/projects/tables.py:51 msgid "Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:50 -#: dashboards/syspanel/projects/tables.py:79 +#: dashboards/syspanel/projects/tables.py:52 +#: dashboards/syspanel/projects/tables.py:81 #: dashboards/syspanel/templates/syspanel/projects/index.html:8 msgid "Projects" msgstr "" -#: dashboards/syspanel/projects/tables.py:71 +#: dashboards/syspanel/projects/tables.py:73 #: dashboards/syspanel/services/tables.py:47 msgid "Id" msgstr "" -#: dashboards/syspanel/projects/tables.py:87 +#: dashboards/syspanel/projects/tables.py:89 msgid "Remove" msgstr "" -#: dashboards/syspanel/projects/tables.py:88 +#: dashboards/syspanel/projects/tables.py:90 msgid "Removed" msgstr "" -#: dashboards/syspanel/projects/tables.py:90 +#: dashboards/syspanel/projects/tables.py:92 #: dashboards/syspanel/templates/syspanel/users/index.html:8 -#: dashboards/syspanel/users/tables.py:91 -#: dashboards/syspanel/users/tables.py:133 +#: dashboards/syspanel/users/tables.py:93 +#: dashboards/syspanel/users/tables.py:135 msgid "Users" msgstr "" -#: dashboards/syspanel/projects/tables.py:101 +#: dashboards/syspanel/projects/tables.py:103 msgid "Users For Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:108 +#: dashboards/syspanel/projects/tables.py:110 msgid "Add To Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:120 +#: dashboards/syspanel/projects/tables.py:122 msgid "Add New Users" msgstr "" @@ -1772,15 +1773,15 @@ msgstr "" msgid "Unable to retrieve roles." msgstr "" -#: dashboards/syspanel/quotas/tables.py:27 +#: dashboards/syspanel/quotas/tables.py:24 msgid "Quota Name" msgstr "" -#: dashboards/syspanel/quotas/tables.py:28 +#: dashboards/syspanel/quotas/tables.py:25 msgid "Limit" msgstr "" -#: dashboards/syspanel/quotas/tables.py:35 +#: dashboards/syspanel/quotas/tables.py:32 msgid "Quotas" msgstr "" @@ -1914,7 +1915,7 @@ msgstr "" #: dashboards/syspanel/users/forms.py:64 #: dashboards/syspanel/users/forms.py:107 -#: dashboards/syspanel/users/tables.py:123 +#: dashboards/syspanel/users/tables.py:125 msgid "Email" msgstr "" @@ -1947,7 +1948,7 @@ msgid "Unable to create user." msgstr "" #: dashboards/syspanel/users/forms.py:106 -#: dashboards/syspanel/users/tables.py:122 views/auth_forms.py:64 +#: dashboards/syspanel/users/tables.py:124 views/auth_forms.py:64 msgid "User Name" msgstr "" @@ -1985,44 +1986,44 @@ msgstr "" msgid "Enable Users" msgstr "" -#: dashboards/syspanel/users/tables.py:45 +#: dashboards/syspanel/users/tables.py:46 #, python-format msgid "Error enabling user: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:48 +#: dashboards/syspanel/users/tables.py:49 #, python-format msgid "Enabled the following users: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:51 +#: dashboards/syspanel/users/tables.py:52 #, python-format msgid "Successfully enabled users: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:58 +#: dashboards/syspanel/users/tables.py:59 msgid "Disable" msgstr "" -#: dashboards/syspanel/users/tables.py:59 +#: dashboards/syspanel/users/tables.py:60 msgid "Disable Users" msgstr "" -#: dashboards/syspanel/users/tables.py:69 +#: dashboards/syspanel/users/tables.py:71 msgid "You cannot disable the user you are currently logged in as." msgstr "" -#: dashboards/syspanel/users/tables.py:77 +#: dashboards/syspanel/users/tables.py:79 #, python-format msgid "Error disabling user: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:80 +#: dashboards/syspanel/users/tables.py:82 #, python-format msgid "Disabled the following users: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:84 +#: dashboards/syspanel/users/tables.py:86 #, python-format msgid "Successfully disabled users: %s" msgstr "" @@ -2036,26 +2037,26 @@ msgstr "" msgid "Unable to update user." msgstr "" -#: tables/actions.py:431 +#: tables/actions.py:451 #, python-format msgid "You do not have permission to %(action)s: %(objs)s" msgstr "" -#: tables/actions.py:437 +#: tables/actions.py:457 #, python-format msgid "Unable to %(action)s: %(objs)s" msgstr "" -#: tables/actions.py:443 +#: tables/actions.py:463 #, python-format msgid "%(action)s: %(objs)s" msgstr "" -#: tables/actions.py:453 +#: tables/actions.py:473 msgid "Delete" msgstr "" -#: tables/actions.py:454 +#: tables/actions.py:474 msgid "Deleted" msgstr "" @@ -2223,23 +2224,23 @@ msgstr "" msgid "Download CSV Summary" msgstr "" -#: usage/tables.py:22 +#: usage/tables.py:23 msgid "VCPU Hours" msgstr "" -#: usage/tables.py:27 +#: usage/tables.py:28 msgid "Project ID" msgstr "" -#: usage/tables.py:29 +#: usage/tables.py:30 msgid "Disk GB Hours" msgstr "" -#: usage/tables.py:37 usage/tables.py:55 +#: usage/tables.py:38 usage/tables.py:56 msgid "Usage Summary" msgstr "" -#: usage/tables.py:47 +#: usage/tables.py:48 msgid "Uptime" msgstr "" diff --git a/horizon/locale/zh_CN/LC_MESSAGES/django.po b/horizon/locale/zh_CN/LC_MESSAGES/django.po index 1f8409db3..8077ce8b5 100644 --- a/horizon/locale/zh_CN/LC_MESSAGES/django.po +++ b/horizon/locale/zh_CN/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-14 13:53-0700\n" +"POT-Creation-Date: 2012-03-14 14:44-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -65,12 +65,12 @@ msgid "Error fetching floating ips: %s" msgstr "" #: dashboards/nova/access_and_security/floating_ips/forms.py:48 -#: dashboards/nova/access_and_security/floating_ips/tables.py:92 +#: dashboards/nova/access_and_security/floating_ips/tables.py:93 #: dashboards/nova/instances_and_volumes/instances/tables.py:56 #: dashboards/nova/instances_and_volumes/instances/tables.py:68 #: dashboards/nova/instances_and_volumes/instances/tables.py:83 -#: dashboards/nova/instances_and_volumes/instances/tables.py:108 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:168 +#: dashboards/nova/instances_and_volumes/instances/tables.py:109 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:167 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:42 msgid "Instance" msgstr "" @@ -114,7 +114,7 @@ msgid "Floating IP" msgstr "" #: dashboards/nova/access_and_security/floating_ips/tables.py:47 -#: dashboards/nova/access_and_security/floating_ips/tables.py:106 +#: dashboards/nova/access_and_security/floating_ips/tables.py:107 #: dashboards/syspanel/projects/forms.py:119 msgid "Floating IPs" msgstr "" @@ -128,22 +128,22 @@ msgstr "" msgid "Disassociate IP" msgstr "" -#: dashboards/nova/access_and_security/floating_ips/tables.py:81 +#: dashboards/nova/access_and_security/floating_ips/tables.py:82 #, python-format msgid "Successfully disassociated Floating IP: %s" msgstr "" -#: dashboards/nova/access_and_security/floating_ips/tables.py:85 +#: dashboards/nova/access_and_security/floating_ips/tables.py:86 msgid "Unable to disassociate floating IP." msgstr "" -#: dashboards/nova/access_and_security/floating_ips/tables.py:90 -#: dashboards/nova/instances_and_volumes/instances/tables.py:214 +#: dashboards/nova/access_and_security/floating_ips/tables.py:91 +#: dashboards/nova/instances_and_volumes/instances/tables.py:219 #: dashboards/syspanel/instances/tables.py:49 msgid "IP Address" msgstr "" -#: dashboards/nova/access_and_security/floating_ips/tables.py:95 +#: dashboards/nova/access_and_security/floating_ips/tables.py:96 msgid "Floating IP Pool" msgstr "" @@ -328,12 +328,12 @@ msgstr "" #: dashboards/nova/access_and_security/security_groups/tables.py:57 #: dashboards/nova/images_and_snapshots/images/forms.py:42 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:120 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:137 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:119 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:136 #: dashboards/syspanel/flavors/forms.py:37 #: dashboards/syspanel/projects/forms.py:60 #: dashboards/syspanel/projects/forms.py:85 -#: dashboards/syspanel/projects/tables.py:72 +#: dashboards/syspanel/projects/tables.py:74 #: dashboards/syspanel/users/forms.py:63 msgid "Name" msgstr "" @@ -341,7 +341,7 @@ msgstr "" #: dashboards/nova/access_and_security/security_groups/tables.py:58 #: dashboards/nova/instances_and_volumes/volumes/forms.py:29 #: dashboards/nova/instances_and_volumes/volumes/forms.py:93 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:123 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:122 #: dashboards/nova/templates/nova/access_and_security/keypairs/_create.html:16 #: dashboards/nova/templates/nova/access_and_security/keypairs/_import.html:16 #: dashboards/nova/templates/nova/access_and_security/security_groups/_create.html:17 @@ -352,7 +352,7 @@ msgstr "" #: dashboards/nova/templates/nova/objects/_upload.html:17 #: dashboards/syspanel/projects/forms.py:63 #: dashboards/syspanel/projects/forms.py:88 -#: dashboards/syspanel/projects/tables.py:74 +#: dashboards/syspanel/projects/tables.py:76 #: dashboards/syspanel/templates/syspanel/flavors/_create.html:17 #: dashboards/syspanel/templates/syspanel/images/_update.html:17 #: dashboards/syspanel/templates/syspanel/projects/_add_user.html:17 @@ -410,7 +410,7 @@ msgid "Unable to create container." msgstr "" #: dashboards/nova/containers/forms.py:59 -#: dashboards/nova/containers/tables.py:169 +#: dashboards/nova/containers/tables.py:170 msgid "Object Name" msgstr "" @@ -444,33 +444,33 @@ msgid "Unable to copy object." msgstr "" #: dashboards/nova/containers/panel.py:28 -#: dashboards/nova/containers/tables.py:37 +#: dashboards/nova/containers/tables.py:36 #: dashboards/nova/containers/tables.py:114 #: dashboards/nova/templates/nova/containers/index.html:8 msgid "Containers" msgstr "" -#: dashboards/nova/containers/tables.py:36 +#: dashboards/nova/containers/tables.py:35 msgid "Container" msgstr "" -#: dashboards/nova/containers/tables.py:53 +#: dashboards/nova/containers/tables.py:52 #, python-format msgid "Unable to delete non-empty container: %s" msgstr "" -#: dashboards/nova/containers/tables.py:57 +#: dashboards/nova/containers/tables.py:56 #, python-format msgid "Successfully deleted containers: %s" msgstr "" -#: dashboards/nova/containers/tables.py:64 +#: dashboards/nova/containers/tables.py:63 #: dashboards/nova/templates/nova/containers/_create.html:22 #: dashboards/nova/templates/nova/containers/create.html:6 msgid "Create Container" msgstr "" -#: dashboards/nova/containers/tables.py:71 +#: dashboards/nova/containers/tables.py:70 msgid "List Objects" msgstr "" @@ -481,14 +481,14 @@ msgstr "" #: dashboards/nova/containers/tables.py:105 #: dashboards/nova/containers/tables.py:121 -#: dashboards/nova/containers/tables.py:177 +#: dashboards/nova/containers/tables.py:178 msgid "Objects" msgstr "" #: dashboards/nova/containers/tables.py:107 -#: dashboards/nova/containers/tables.py:170 -#: dashboards/nova/instances_and_volumes/instances/tables.py:215 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:124 +#: dashboards/nova/containers/tables.py:171 +#: dashboards/nova/instances_and_volumes/instances/tables.py:220 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:123 #: dashboards/syspanel/instances/tables.py:50 msgid "Size" msgstr "" @@ -665,8 +665,8 @@ msgid "Image Name" msgstr "" #: dashboards/nova/images_and_snapshots/images/tables.py:76 -#: dashboards/nova/instances_and_volumes/instances/tables.py:218 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:127 +#: dashboards/nova/instances_and_volumes/instances/tables.py:223 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:126 #: dashboards/nova/templates/nova/images_and_snapshots/images/detail.html:12 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:6 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:9 @@ -704,13 +704,13 @@ msgstr "" #: dashboards/nova/images_and_snapshots/images/views.py:115 #: dashboards/nova/images_and_snapshots/snapshots/tables.py:28 -#: dashboards/nova/instances_and_volumes/instances/tables.py:144 +#: dashboards/nova/instances_and_volumes/instances/tables.py:147 msgid "Snapshot" msgstr "" #: dashboards/nova/images_and_snapshots/images/views.py:118 #: dashboards/nova/instances_and_volumes/volumes/tables.py:35 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:155 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:154 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:74 msgid "Volume" msgstr "" @@ -762,11 +762,11 @@ msgid "Volume Snapshot" msgstr "" #: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:31 -#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:43 +#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:42 msgid "Volume Snapshots" msgstr "" -#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:39 +#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:38 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:10 msgid "Volume ID" msgstr "" @@ -805,8 +805,8 @@ msgstr "" #: dashboards/nova/instances_and_volumes/instances/tables.py:57 #: dashboards/nova/instances_and_volumes/instances/tables.py:69 #: dashboards/nova/instances_and_volumes/instances/tables.py:84 -#: dashboards/nova/instances_and_volumes/instances/tables.py:109 -#: dashboards/nova/instances_and_volumes/instances/tables.py:232 +#: dashboards/nova/instances_and_volumes/instances/tables.py:110 +#: dashboards/nova/instances_and_volumes/instances/tables.py:237 #: dashboards/syspanel/instances/tables.py:67 #: dashboards/syspanel/projects/forms.py:115 #: dashboards/syspanel/templates/syspanel/instances/index.html:3 @@ -837,61 +837,61 @@ msgstr "" msgid "Unpaused" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:106 +#: dashboards/nova/instances_and_volumes/instances/tables.py:107 msgid "Suspend" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:106 +#: dashboards/nova/instances_and_volumes/instances/tables.py:107 msgid "Resume" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:107 +#: dashboards/nova/instances_and_volumes/instances/tables.py:108 msgid "Suspended" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:107 +#: dashboards/nova/instances_and_volumes/instances/tables.py:108 msgid "Resumed" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:131 +#: dashboards/nova/instances_and_volumes/instances/tables.py:133 #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:53 #: dashboards/nova/templates/nova/images_and_snapshots/images/launch.html:13 msgid "Launch Instance" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:137 +#: dashboards/nova/instances_and_volumes/instances/tables.py:140 msgid "Edit Instance" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:154 +#: dashboards/nova/instances_and_volumes/instances/tables.py:157 msgid "VNC Console" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:163 +#: dashboards/nova/instances_and_volumes/instances/tables.py:167 msgid "View Log" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:190 +#: dashboards/nova/instances_and_volumes/instances/tables.py:195 #, python-format msgid "%(RAM)s RAM | %(VCPU)s VCPU | %(disk)s Disk" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:195 +#: dashboards/nova/instances_and_volumes/instances/tables.py:200 msgid "Not available" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:213 +#: dashboards/nova/instances_and_volumes/instances/tables.py:218 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:10 -#: dashboards/syspanel/instances/tables.py:48 usage/tables.py:45 +#: dashboards/syspanel/instances/tables.py:48 usage/tables.py:46 msgid "Instance Name" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:222 +#: dashboards/nova/instances_and_volumes/instances/tables.py:227 #: dashboards/syspanel/instances/tables.py:57 msgid "Task" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:228 +#: dashboards/nova/instances_and_volumes/instances/tables.py:233 #: dashboards/syspanel/instances/tables.py:63 msgid "Power State" msgstr "" @@ -959,49 +959,49 @@ msgid "Error Creating Volume Snapshot: %(exc)s" msgstr "" #: dashboards/nova/instances_and_volumes/volumes/tables.py:36 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:144 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:156 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:143 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:155 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:68 #: dashboards/syspanel/projects/forms.py:116 msgid "Volumes" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:53 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:52 msgid "Volumes in error states cannot be deleted via the Nova API." msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:59 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:58 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_create.html:23 msgid "Create Volume" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:66 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:65 msgid "Edit Attachments" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:76 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:75 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html:8 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html:23 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/create.html:3 msgid "Create Snapshot" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:94 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:93 #: templatetags/sizeformat.py:58 #, python-format msgid "%s GB" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:140 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:139 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:35 msgid "Attachments" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:153 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:152 msgid "Detach" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:154 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:153 msgid "Detached" msgstr "" @@ -1170,13 +1170,13 @@ msgstr "" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:20 #: dashboards/syspanel/flavors/forms.py:38 #: dashboards/syspanel/flavors/tables.py:30 -#: dashboards/syspanel/projects/forms.py:114 usage/tables.py:17 +#: dashboards/syspanel/projects/forms.py:114 usage/tables.py:18 msgid "VCPUs" msgstr "" #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:37 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:21 -#: usage/tables.py:18 +#: usage/tables.py:19 msgid "Disk" msgstr "" @@ -1317,7 +1317,7 @@ msgid "Instance ID" msgstr "" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:19 -#: usage/tables.py:20 +#: usage/tables.py:21 msgid "RAM" msgstr "" @@ -1473,11 +1473,11 @@ msgstr "" msgid "Unable to retrieve tenant list." msgstr "" -#: dashboards/settings/ec2/forms.py:71 +#: dashboards/settings/ec2/forms.py:85 msgid "Unable to fetch EC2 credentials." msgstr "" -#: dashboards/settings/ec2/forms.py:84 +#: dashboards/settings/ec2/forms.py:98 #, python-format msgid "Error writing zipfile: %(exc)s" msgstr "" @@ -1495,13 +1495,14 @@ msgstr "" #: dashboards/settings/templates/settings/ec2/download_form.html:23 #: dashboards/settings/templates/settings/ec2/index.html:3 #: dashboards/settings/templates/settings/ec2/index.html:6 -msgid "Download x509 Credentials" +msgid "Download EC2 Credentials" msgstr "" #: dashboards/settings/templates/settings/ec2/download_form.html:18 msgid "" -"Clicking \"Download x509 Credentials\" will download a zip file which " -"contains your x509 private key and certificate." +"Clicking \"Download EC2 Credentials\" will download a zip file which " +"includes an rc file with your access/secret keys, as well as your x509 " +"private key and certificate." msgstr "" #: dashboards/settings/templates/settings/project/_openrc.html:8 @@ -1611,8 +1612,8 @@ msgid "Tenant" msgstr "" #: dashboards/syspanel/instances/tables.py:42 -#: dashboards/syspanel/projects/tables.py:89 -#: dashboards/syspanel/users/tables.py:90 +#: dashboards/syspanel/projects/tables.py:91 +#: dashboards/syspanel/users/tables.py:92 msgid "User" msgstr "" @@ -1635,9 +1636,9 @@ msgstr "" #: dashboards/syspanel/projects/forms.py:64 #: dashboards/syspanel/projects/forms.py:89 -#: dashboards/syspanel/projects/tables.py:75 +#: dashboards/syspanel/projects/tables.py:77 #: dashboards/syspanel/services/tables.py:51 -#: dashboards/syspanel/users/tables.py:127 +#: dashboards/syspanel/users/tables.py:129 msgid "Enabled" msgstr "" @@ -1652,7 +1653,7 @@ msgstr "" #: dashboards/syspanel/projects/forms.py:83 #: dashboards/syspanel/users/forms.py:105 -#: dashboards/syspanel/users/tables.py:121 +#: dashboards/syspanel/users/tables.py:123 msgid "ID" msgstr "" @@ -1706,57 +1707,57 @@ msgstr "" msgid "Modify Users" msgstr "" -#: dashboards/syspanel/projects/tables.py:30 +#: dashboards/syspanel/projects/tables.py:31 msgid "View Usage" msgstr "" -#: dashboards/syspanel/projects/tables.py:36 +#: dashboards/syspanel/projects/tables.py:38 msgid "Edit Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:43 +#: dashboards/syspanel/projects/tables.py:45 msgid "Create New Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:49 +#: dashboards/syspanel/projects/tables.py:51 msgid "Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:50 -#: dashboards/syspanel/projects/tables.py:79 +#: dashboards/syspanel/projects/tables.py:52 +#: dashboards/syspanel/projects/tables.py:81 #: dashboards/syspanel/templates/syspanel/projects/index.html:8 msgid "Projects" msgstr "" -#: dashboards/syspanel/projects/tables.py:71 +#: dashboards/syspanel/projects/tables.py:73 #: dashboards/syspanel/services/tables.py:47 msgid "Id" msgstr "" -#: dashboards/syspanel/projects/tables.py:87 +#: dashboards/syspanel/projects/tables.py:89 msgid "Remove" msgstr "" -#: dashboards/syspanel/projects/tables.py:88 +#: dashboards/syspanel/projects/tables.py:90 msgid "Removed" msgstr "" -#: dashboards/syspanel/projects/tables.py:90 +#: dashboards/syspanel/projects/tables.py:92 #: dashboards/syspanel/templates/syspanel/users/index.html:8 -#: dashboards/syspanel/users/tables.py:91 -#: dashboards/syspanel/users/tables.py:133 +#: dashboards/syspanel/users/tables.py:93 +#: dashboards/syspanel/users/tables.py:135 msgid "Users" msgstr "" -#: dashboards/syspanel/projects/tables.py:101 +#: dashboards/syspanel/projects/tables.py:103 msgid "Users For Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:108 +#: dashboards/syspanel/projects/tables.py:110 msgid "Add To Project" msgstr "" -#: dashboards/syspanel/projects/tables.py:120 +#: dashboards/syspanel/projects/tables.py:122 msgid "Add New Users" msgstr "" @@ -1772,15 +1773,15 @@ msgstr "" msgid "Unable to retrieve roles." msgstr "" -#: dashboards/syspanel/quotas/tables.py:27 +#: dashboards/syspanel/quotas/tables.py:24 msgid "Quota Name" msgstr "" -#: dashboards/syspanel/quotas/tables.py:28 +#: dashboards/syspanel/quotas/tables.py:25 msgid "Limit" msgstr "" -#: dashboards/syspanel/quotas/tables.py:35 +#: dashboards/syspanel/quotas/tables.py:32 msgid "Quotas" msgstr "" @@ -1914,7 +1915,7 @@ msgstr "" #: dashboards/syspanel/users/forms.py:64 #: dashboards/syspanel/users/forms.py:107 -#: dashboards/syspanel/users/tables.py:123 +#: dashboards/syspanel/users/tables.py:125 msgid "Email" msgstr "" @@ -1947,7 +1948,7 @@ msgid "Unable to create user." msgstr "" #: dashboards/syspanel/users/forms.py:106 -#: dashboards/syspanel/users/tables.py:122 views/auth_forms.py:64 +#: dashboards/syspanel/users/tables.py:124 views/auth_forms.py:64 msgid "User Name" msgstr "" @@ -1985,44 +1986,44 @@ msgstr "" msgid "Enable Users" msgstr "" -#: dashboards/syspanel/users/tables.py:45 +#: dashboards/syspanel/users/tables.py:46 #, python-format msgid "Error enabling user: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:48 +#: dashboards/syspanel/users/tables.py:49 #, python-format msgid "Enabled the following users: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:51 +#: dashboards/syspanel/users/tables.py:52 #, python-format msgid "Successfully enabled users: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:58 +#: dashboards/syspanel/users/tables.py:59 msgid "Disable" msgstr "" -#: dashboards/syspanel/users/tables.py:59 +#: dashboards/syspanel/users/tables.py:60 msgid "Disable Users" msgstr "" -#: dashboards/syspanel/users/tables.py:69 +#: dashboards/syspanel/users/tables.py:71 msgid "You cannot disable the user you are currently logged in as." msgstr "" -#: dashboards/syspanel/users/tables.py:77 +#: dashboards/syspanel/users/tables.py:79 #, python-format msgid "Error disabling user: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:80 +#: dashboards/syspanel/users/tables.py:82 #, python-format msgid "Disabled the following users: %s" msgstr "" -#: dashboards/syspanel/users/tables.py:84 +#: dashboards/syspanel/users/tables.py:86 #, python-format msgid "Successfully disabled users: %s" msgstr "" @@ -2036,26 +2037,26 @@ msgstr "" msgid "Unable to update user." msgstr "" -#: tables/actions.py:431 +#: tables/actions.py:451 #, python-format msgid "You do not have permission to %(action)s: %(objs)s" msgstr "" -#: tables/actions.py:437 +#: tables/actions.py:457 #, python-format msgid "Unable to %(action)s: %(objs)s" msgstr "" -#: tables/actions.py:443 +#: tables/actions.py:463 #, python-format msgid "%(action)s: %(objs)s" msgstr "" -#: tables/actions.py:453 +#: tables/actions.py:473 msgid "Delete" msgstr "" -#: tables/actions.py:454 +#: tables/actions.py:474 msgid "Deleted" msgstr "" @@ -2223,23 +2224,23 @@ msgstr "" msgid "Download CSV Summary" msgstr "" -#: usage/tables.py:22 +#: usage/tables.py:23 msgid "VCPU Hours" msgstr "" -#: usage/tables.py:27 +#: usage/tables.py:28 msgid "Project ID" msgstr "" -#: usage/tables.py:29 +#: usage/tables.py:30 msgid "Disk GB Hours" msgstr "" -#: usage/tables.py:37 usage/tables.py:55 +#: usage/tables.py:38 usage/tables.py:56 msgid "Usage Summary" msgstr "" -#: usage/tables.py:47 +#: usage/tables.py:48 msgid "Uptime" msgstr "" diff --git a/horizon/locale/zh_TW/LC_MESSAGES/django.po b/horizon/locale/zh_TW/LC_MESSAGES/django.po index ea397e6e1..aa0563f1f 100644 --- a/horizon/locale/zh_TW/LC_MESSAGES/django.po +++ b/horizon/locale/zh_TW/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-14 13:53-0700\n" +"POT-Creation-Date: 2012-03-14 14:44-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Andy Chong \n" "Language-Team: LANGUAGE \n" @@ -65,12 +65,12 @@ msgid "Error fetching floating ips: %s" msgstr "浮動IP 取得錯誤： %s" #: dashboards/nova/access_and_security/floating_ips/forms.py:48 -#: dashboards/nova/access_and_security/floating_ips/tables.py:92 +#: dashboards/nova/access_and_security/floating_ips/tables.py:93 #: dashboards/nova/instances_and_volumes/instances/tables.py:56 #: dashboards/nova/instances_and_volumes/instances/tables.py:68 #: dashboards/nova/instances_and_volumes/instances/tables.py:83 -#: dashboards/nova/instances_and_volumes/instances/tables.py:108 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:168 +#: dashboards/nova/instances_and_volumes/instances/tables.py:109 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:167 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:42 msgid "Instance" msgstr "執行個體" @@ -114,7 +114,7 @@ msgid "Floating IP" msgstr "浮動IP" #: dashboards/nova/access_and_security/floating_ips/tables.py:47 -#: dashboards/nova/access_and_security/floating_ips/tables.py:106 +#: dashboards/nova/access_and_security/floating_ips/tables.py:107 #: dashboards/syspanel/projects/forms.py:119 msgid "Floating IPs" msgstr "浮動IP" @@ -128,22 +128,22 @@ msgstr "配給IP" msgid "Disassociate IP" msgstr "釋放IP" -#: dashboards/nova/access_and_security/floating_ips/tables.py:81 +#: dashboards/nova/access_and_security/floating_ips/tables.py:82 #, python-format msgid "Successfully disassociated Floating IP: %s" msgstr "已成功釋放浮動IP： %s" -#: dashboards/nova/access_and_security/floating_ips/tables.py:85 +#: dashboards/nova/access_and_security/floating_ips/tables.py:86 msgid "Unable to disassociate floating IP." msgstr "無法釋放浮動IP。" -#: dashboards/nova/access_and_security/floating_ips/tables.py:90 -#: dashboards/nova/instances_and_volumes/instances/tables.py:214 +#: dashboards/nova/access_and_security/floating_ips/tables.py:91 +#: dashboards/nova/instances_and_volumes/instances/tables.py:219 #: dashboards/syspanel/instances/tables.py:49 msgid "IP Address" msgstr "IP位址" -#: dashboards/nova/access_and_security/floating_ips/tables.py:95 +#: dashboards/nova/access_and_security/floating_ips/tables.py:96 msgid "Floating IP Pool" msgstr "浮動IP集" @@ -332,12 +332,12 @@ msgstr "編輯規則" #: dashboards/nova/access_and_security/security_groups/tables.py:57 #: dashboards/nova/images_and_snapshots/images/forms.py:42 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:120 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:137 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:119 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:136 #: dashboards/syspanel/flavors/forms.py:37 #: dashboards/syspanel/projects/forms.py:60 #: dashboards/syspanel/projects/forms.py:85 -#: dashboards/syspanel/projects/tables.py:72 +#: dashboards/syspanel/projects/tables.py:74 #: dashboards/syspanel/users/forms.py:63 msgid "Name" msgstr "名稱" @@ -345,7 +345,7 @@ msgstr "名稱" #: dashboards/nova/access_and_security/security_groups/tables.py:58 #: dashboards/nova/instances_and_volumes/volumes/forms.py:29 #: dashboards/nova/instances_and_volumes/volumes/forms.py:93 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:123 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:122 #: dashboards/nova/templates/nova/access_and_security/keypairs/_create.html:16 #: dashboards/nova/templates/nova/access_and_security/keypairs/_import.html:16 #: dashboards/nova/templates/nova/access_and_security/security_groups/_create.html:17 @@ -356,7 +356,7 @@ msgstr "名稱" #: dashboards/nova/templates/nova/objects/_upload.html:17 #: dashboards/syspanel/projects/forms.py:63 #: dashboards/syspanel/projects/forms.py:88 -#: dashboards/syspanel/projects/tables.py:74 +#: dashboards/syspanel/projects/tables.py:76 #: dashboards/syspanel/templates/syspanel/flavors/_create.html:17 #: dashboards/syspanel/templates/syspanel/images/_update.html:17 #: dashboards/syspanel/templates/syspanel/projects/_add_user.html:17 @@ -414,7 +414,7 @@ msgid "Unable to create container." msgstr "無法建立容器" #: dashboards/nova/containers/forms.py:59 -#: dashboards/nova/containers/tables.py:169 +#: dashboards/nova/containers/tables.py:170 msgid "Object Name" msgstr "物件名稱" @@ -448,34 +448,34 @@ msgid "Unable to copy object." msgstr "無法複製物件" #: dashboards/nova/containers/panel.py:28 -#: dashboards/nova/containers/tables.py:37 +#: dashboards/nova/containers/tables.py:36 #: dashboards/nova/containers/tables.py:114 #: dashboards/nova/templates/nova/containers/index.html:8 msgid "Containers" msgstr "容器" -#: dashboards/nova/containers/tables.py:36 +#: dashboards/nova/containers/tables.py:35 #, fuzzy msgid "Container" msgstr "容器" -#: dashboards/nova/containers/tables.py:53 +#: dashboards/nova/containers/tables.py:52 #, python-format msgid "Unable to delete non-empty container: %s" msgstr "無法刪除還沒清空的容器： %s" -#: dashboards/nova/containers/tables.py:57 +#: dashboards/nova/containers/tables.py:56 #, python-format msgid "Successfully deleted containers: %s" msgstr "已成功刪除容器： %s" -#: dashboards/nova/containers/tables.py:64 +#: dashboards/nova/containers/tables.py:63 #: dashboards/nova/templates/nova/containers/_create.html:22 #: dashboards/nova/templates/nova/containers/create.html:6 msgid "Create Container" msgstr "建立容器" -#: dashboards/nova/containers/tables.py:71 +#: dashboards/nova/containers/tables.py:70 msgid "List Objects" msgstr "列出物件" @@ -486,14 +486,14 @@ msgstr "上傳物件" #: dashboards/nova/containers/tables.py:105 #: dashboards/nova/containers/tables.py:121 -#: dashboards/nova/containers/tables.py:177 +#: dashboards/nova/containers/tables.py:178 msgid "Objects" msgstr "物件" #: dashboards/nova/containers/tables.py:107 -#: dashboards/nova/containers/tables.py:170 -#: dashboards/nova/instances_and_volumes/instances/tables.py:215 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:124 +#: dashboards/nova/containers/tables.py:171 +#: dashboards/nova/instances_and_volumes/instances/tables.py:220 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:123 #: dashboards/syspanel/instances/tables.py:50 msgid "Size" msgstr "大小" @@ -673,8 +673,8 @@ msgid "Image Name" msgstr "映像名稱" #: dashboards/nova/images_and_snapshots/images/tables.py:76 -#: dashboards/nova/instances_and_volumes/instances/tables.py:218 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:127 +#: dashboards/nova/instances_and_volumes/instances/tables.py:223 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:126 #: dashboards/nova/templates/nova/images_and_snapshots/images/detail.html:12 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:6 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:9 @@ -712,13 +712,13 @@ msgstr "選擇容量" #: dashboards/nova/images_and_snapshots/images/views.py:115 #: dashboards/nova/images_and_snapshots/snapshots/tables.py:28 -#: dashboards/nova/instances_and_volumes/instances/tables.py:144 +#: dashboards/nova/instances_and_volumes/instances/tables.py:147 msgid "Snapshot" msgstr "快照" #: dashboards/nova/images_and_snapshots/images/views.py:118 #: dashboards/nova/instances_and_volumes/volumes/tables.py:35 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:155 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:154 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:74 msgid "Volume" msgstr "容量" @@ -770,11 +770,11 @@ msgid "Volume Snapshot" msgstr "容量快照" #: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:31 -#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:43 +#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:42 msgid "Volume Snapshots" msgstr "容量快照" -#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:39 +#: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:38 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:10 msgid "Volume ID" msgstr "容量ID" @@ -813,8 +813,8 @@ msgstr "已終止執行" #: dashboards/nova/instances_and_volumes/instances/tables.py:57 #: dashboards/nova/instances_and_volumes/instances/tables.py:69 #: dashboards/nova/instances_and_volumes/instances/tables.py:84 -#: dashboards/nova/instances_and_volumes/instances/tables.py:109 -#: dashboards/nova/instances_and_volumes/instances/tables.py:232 +#: dashboards/nova/instances_and_volumes/instances/tables.py:110 +#: dashboards/nova/instances_and_volumes/instances/tables.py:237 #: dashboards/syspanel/instances/tables.py:67 #: dashboards/syspanel/projects/forms.py:115 #: dashboards/syspanel/templates/syspanel/instances/index.html:3 @@ -845,61 +845,61 @@ msgstr "已暫停" msgid "Unpaused" msgstr "已取消暫停" -#: dashboards/nova/instances_and_volumes/instances/tables.py:106 +#: dashboards/nova/instances_and_volumes/instances/tables.py:107 msgid "Suspend" msgstr "休眠" -#: dashboards/nova/instances_and_volumes/instances/tables.py:106 +#: dashboards/nova/instances_and_volumes/instances/tables.py:107 msgid "Resume" msgstr "喚醒" -#: dashboards/nova/instances_and_volumes/instances/tables.py:107 +#: dashboards/nova/instances_and_volumes/instances/tables.py:108 msgid "Suspended" msgstr "已休眠" -#: dashboards/nova/instances_and_volumes/instances/tables.py:107 +#: dashboards/nova/instances_and_volumes/instances/tables.py:108 msgid "Resumed" msgstr "已喚醒" -#: dashboards/nova/instances_and_volumes/instances/tables.py:131 +#: dashboards/nova/instances_and_volumes/instances/tables.py:133 #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:53 #: dashboards/nova/templates/nova/images_and_snapshots/images/launch.html:13 msgid "Launch Instance" msgstr "啟動執行個體" -#: dashboards/nova/instances_and_volumes/instances/tables.py:137 +#: dashboards/nova/instances_and_volumes/instances/tables.py:140 msgid "Edit Instance" msgstr "編輯執行個體" -#: dashboards/nova/instances_and_volumes/instances/tables.py:154 +#: dashboards/nova/instances_and_volumes/instances/tables.py:157 msgid "VNC Console" msgstr "VNC界面" -#: dashboards/nova/instances_and_volumes/instances/tables.py:163 +#: dashboards/nova/instances_and_volumes/instances/tables.py:167 msgid "View Log" msgstr "檢視記錄檔" -#: dashboards/nova/instances_and_volumes/instances/tables.py:190 +#: dashboards/nova/instances_and_volumes/instances/tables.py:195 #, python-format msgid "%(RAM)s RAM | %(VCPU)s VCPU | %(disk)s Disk" msgstr "%(RAM)s 記憶體 | %(VCPU)s 虛擬處理器 | %(disk)s 磁碟" -#: dashboards/nova/instances_and_volumes/instances/tables.py:195 +#: dashboards/nova/instances_and_volumes/instances/tables.py:200 msgid "Not available" msgstr "不存在" -#: dashboards/nova/instances_and_volumes/instances/tables.py:213 +#: dashboards/nova/instances_and_volumes/instances/tables.py:218 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:10 -#: dashboards/syspanel/instances/tables.py:48 usage/tables.py:45 +#: dashboards/syspanel/instances/tables.py:48 usage/tables.py:46 msgid "Instance Name" msgstr "執行個體名稱" -#: dashboards/nova/instances_and_volumes/instances/tables.py:222 +#: dashboards/nova/instances_and_volumes/instances/tables.py:227 #: dashboards/syspanel/instances/tables.py:57 msgid "Task" msgstr "工作" -#: dashboards/nova/instances_and_volumes/instances/tables.py:228 +#: dashboards/nova/instances_and_volumes/instances/tables.py:233 #: dashboards/syspanel/instances/tables.py:63 msgid "Power State" msgstr "電源狀態" @@ -967,49 +967,49 @@ msgid "Error Creating Volume Snapshot: %(exc)s" msgstr "建立容量快照錯誤： %(exc)s" #: dashboards/nova/instances_and_volumes/volumes/tables.py:36 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:144 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:156 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:143 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:155 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:68 #: dashboards/syspanel/projects/forms.py:116 msgid "Volumes" msgstr "容量" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:53 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:52 msgid "Volumes in error states cannot be deleted via the Nova API." msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:59 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:58 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_create.html:23 msgid "Create Volume" msgstr "建立容量" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:66 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:65 msgid "Edit Attachments" msgstr "編輯掛載" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:76 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:75 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html:8 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html:23 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/create.html:3 msgid "Create Snapshot" msgstr "建立快照" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:94 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:93 #: templatetags/sizeformat.py:58 #, python-format msgid "%s GB" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:140 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:139 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:35 msgid "Attachments" msgstr "掛載" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:153 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:152 msgid "Detach" msgstr "卸載" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:154 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:153 msgid "Detached" msgstr "已卸載" @@ -1187,13 +1187,13 @@ msgstr "" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:20 #: dashboards/syspanel/flavors/forms.py:38 #: dashboards/syspanel/flavors/tables.py:30 -#: dashboards/syspanel/projects/forms.py:114 usage/tables.py:17 +#: dashboards/syspanel/projects/forms.py:114 usage/tables.py:18 msgid "VCPUs" msgstr "虛擬處理器" #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:37 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:21 -#: usage/tables.py:18 +#: usage/tables.py:19 msgid "Disk" msgstr "磁碟" @@ -1334,7 +1334,7 @@ msgid "Instance ID" msgstr "執行個體ID" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:19 -#: usage/tables.py:20 +#: usage/tables.py:21 msgid "RAM" msgstr "記憶體" @@ -1501,11 +1501,11 @@ msgstr "選擇專案" msgid "Unable to retrieve tenant list." msgstr "無法取得租戶列表" -#: dashboards/settings/ec2/forms.py:71 +#: dashboards/settings/ec2/forms.py:85 msgid "Unable to fetch EC2 credentials." msgstr "無法讀取EC2認證憑據資料" -#: dashboards/settings/ec2/forms.py:84 +#: dashboards/settings/ec2/forms.py:98 #, python-format msgid "Error writing zipfile: %(exc)s" msgstr "寫入壓縮檔錯誤： %(exc)s" @@ -1523,13 +1523,16 @@ msgstr "下載RC檔案錯誤： %s" #: dashboards/settings/templates/settings/ec2/download_form.html:23 #: dashboards/settings/templates/settings/ec2/index.html:3 #: dashboards/settings/templates/settings/ec2/index.html:6 -msgid "Download x509 Credentials" +#, fuzzy +msgid "Download EC2 Credentials" msgstr "下載x509認證憑據資料" #: dashboards/settings/templates/settings/ec2/download_form.html:18 +#, fuzzy msgid "" -"Clicking \"Download x509 Credentials\" will download a zip file which " -"contains your x509 private key and certificate." +"Clicking \"Download EC2 Credentials\" will download a zip file which " +"includes an rc file with your access/secret keys, as well as your x509 " +"private key and certificate." msgstr "" "點擊\"下載x509認證憑據資料\"會下載一個壓縮檔，裡面含有您的x509私鑰和憑證" @@ -1643,8 +1646,8 @@ msgid "Tenant" msgstr "租戶" #: dashboards/syspanel/instances/tables.py:42 -#: dashboards/syspanel/projects/tables.py:89 -#: dashboards/syspanel/users/tables.py:90 +#: dashboards/syspanel/projects/tables.py:91 +#: dashboards/syspanel/users/tables.py:92 msgid "User" msgstr "使用者" @@ -1667,9 +1670,9 @@ msgstr "無法將使用者加入租戶" #: dashboards/syspanel/projects/forms.py:64 #: dashboards/syspanel/projects/forms.py:89 -#: dashboards/syspanel/projects/tables.py:75 +#: dashboards/syspanel/projects/tables.py:77 #: dashboards/syspanel/services/tables.py:51 -#: dashboards/syspanel/users/tables.py:127 +#: dashboards/syspanel/users/tables.py:129 msgid "Enabled" msgstr "已啟用" @@ -1684,7 +1687,7 @@ msgstr "無法建立租戶" #: dashboards/syspanel/projects/forms.py:83 #: dashboards/syspanel/users/forms.py:105 -#: dashboards/syspanel/users/tables.py:121 +#: dashboards/syspanel/users/tables.py:123 msgid "ID" msgstr "ID" @@ -1738,57 +1741,57 @@ msgstr "修改配額" msgid "Modify Users" msgstr "修改使用者" -#: dashboards/syspanel/projects/tables.py:30 +#: dashboards/syspanel/projects/tables.py:31 msgid "View Usage" msgstr "檢視使用量" -#: dashboards/syspanel/projects/tables.py:36 +#: dashboards/syspanel/projects/tables.py:38 msgid "Edit Project" msgstr "編輯專案" -#: dashboards/syspanel/projects/tables.py:43 +#: dashboards/syspanel/projects/tables.py:45 msgid "Create New Project" msgstr "建立新專案" -#: dashboards/syspanel/projects/tables.py:49 +#: dashboards/syspanel/projects/tables.py:51 msgid "Project" msgstr "專案" -#: dashboards/syspanel/projects/tables.py:50 -#: dashboards/syspanel/projects/tables.py:79 +#: dashboards/syspanel/projects/tables.py:52 +#: dashboards/syspanel/projects/tables.py:81 #: dashboards/syspanel/templates/syspanel/projects/index.html:8 msgid "Projects" msgstr "專案" -#: dashboards/syspanel/projects/tables.py:71 +#: dashboards/syspanel/projects/tables.py:73 #: dashboards/syspanel/services/tables.py:47 msgid "Id" msgstr "Id" -#: dashboards/syspanel/projects/tables.py:87 +#: dashboards/syspanel/projects/tables.py:89 msgid "Remove" msgstr "移除" -#: dashboards/syspanel/projects/tables.py:88 +#: dashboards/syspanel/projects/tables.py:90 msgid "Removed" msgstr "已移除" -#: dashboards/syspanel/projects/tables.py:90 +#: dashboards/syspanel/projects/tables.py:92 #: dashboards/syspanel/templates/syspanel/users/index.html:8 -#: dashboards/syspanel/users/tables.py:91 -#: dashboards/syspanel/users/tables.py:133 +#: dashboards/syspanel/users/tables.py:93 +#: dashboards/syspanel/users/tables.py:135 msgid "Users" msgstr "使用者" -#: dashboards/syspanel/projects/tables.py:101 +#: dashboards/syspanel/projects/tables.py:103 msgid "Users For Project" msgstr "專案使用者" -#: dashboards/syspanel/projects/tables.py:108 +#: dashboards/syspanel/projects/tables.py:110 msgid "Add To Project" msgstr "加入專案" -#: dashboards/syspanel/projects/tables.py:120 +#: dashboards/syspanel/projects/tables.py:122 msgid "Add New Users" msgstr "新增使用者" @@ -1804,15 +1807,15 @@ msgstr "無法取得使用者" msgid "Unable to retrieve roles." msgstr "無法取得角色" -#: dashboards/syspanel/quotas/tables.py:27 +#: dashboards/syspanel/quotas/tables.py:24 msgid "Quota Name" msgstr "配額名稱" -#: dashboards/syspanel/quotas/tables.py:28 +#: dashboards/syspanel/quotas/tables.py:25 msgid "Limit" msgstr "限制" -#: dashboards/syspanel/quotas/tables.py:35 +#: dashboards/syspanel/quotas/tables.py:32 msgid "Quotas" msgstr "配額" @@ -1946,7 +1949,7 @@ msgstr "" #: dashboards/syspanel/users/forms.py:64 #: dashboards/syspanel/users/forms.py:107 -#: dashboards/syspanel/users/tables.py:123 +#: dashboards/syspanel/users/tables.py:125 msgid "Email" msgstr "電子郵件" @@ -1980,7 +1983,7 @@ msgid "Unable to create user." msgstr "無法建立使用者。" #: dashboards/syspanel/users/forms.py:106 -#: dashboards/syspanel/users/tables.py:122 views/auth_forms.py:64 +#: dashboards/syspanel/users/tables.py:124 views/auth_forms.py:64 msgid "User Name" msgstr "使用者名稱" @@ -2018,44 +2021,44 @@ msgstr "啟用" msgid "Enable Users" msgstr "啟用使用者" -#: dashboards/syspanel/users/tables.py:45 +#: dashboards/syspanel/users/tables.py:46 #, python-format msgid "Error enabling user: %s" msgstr "啟用使用者錯誤： %s" -#: dashboards/syspanel/users/tables.py:48 +#: dashboards/syspanel/users/tables.py:49 #, python-format msgid "Enabled the following users: %s" msgstr "已啟用以下使用者： %s" -#: dashboards/syspanel/users/tables.py:51 +#: dashboards/syspanel/users/tables.py:52 #, python-format msgid "Successfully enabled users: %s" msgstr "已成功啟用使用者： %s" -#: dashboards/syspanel/users/tables.py:58 +#: dashboards/syspanel/users/tables.py:59 msgid "Disable" msgstr "停用" -#: dashboards/syspanel/users/tables.py:59 +#: dashboards/syspanel/users/tables.py:60 msgid "Disable Users" msgstr "停用使用者" -#: dashboards/syspanel/users/tables.py:69 +#: dashboards/syspanel/users/tables.py:71 msgid "You cannot disable the user you are currently logged in as." msgstr "您不能停用您目前登入使用的使用者" -#: dashboards/syspanel/users/tables.py:77 +#: dashboards/syspanel/users/tables.py:79 #, python-format msgid "Error disabling user: %s" msgstr "停用使用者錯誤： %s" -#: dashboards/syspanel/users/tables.py:80 +#: dashboards/syspanel/users/tables.py:82 #, python-format msgid "Disabled the following users: %s" msgstr "已停用以下使用者： %s" -#: dashboards/syspanel/users/tables.py:84 +#: dashboards/syspanel/users/tables.py:86 #, python-format msgid "Successfully disabled users: %s" msgstr "已成功停用使用者： %s" @@ -2069,26 +2072,26 @@ msgstr "無法取得使用者資訊： %s" msgid "Unable to update user." msgstr "無法更新使用者。" -#: tables/actions.py:431 +#: tables/actions.py:451 #, python-format msgid "You do not have permission to %(action)s: %(objs)s" msgstr "您沒有權限使用%(action)s: %(objs)s" -#: tables/actions.py:437 +#: tables/actions.py:457 #, python-format msgid "Unable to %(action)s: %(objs)s" msgstr "無法%(action)s: %(objs)s" -#: tables/actions.py:443 +#: tables/actions.py:463 #, python-format msgid "%(action)s: %(objs)s" msgstr "" -#: tables/actions.py:453 +#: tables/actions.py:473 msgid "Delete" msgstr "刪除" -#: tables/actions.py:454 +#: tables/actions.py:474 msgid "Deleted" msgstr "已刪除" @@ -2256,23 +2259,23 @@ msgstr "您正在查看未來的資料，它可能並不存在" msgid "Download CSV Summary" msgstr "下載CSV摘要" -#: usage/tables.py:22 +#: usage/tables.py:23 msgid "VCPU Hours" msgstr "虛擬處理器時數" -#: usage/tables.py:27 +#: usage/tables.py:28 msgid "Project ID" msgstr "專案ID" -#: usage/tables.py:29 +#: usage/tables.py:30 msgid "Disk GB Hours" msgstr "磁碟GB時數" -#: usage/tables.py:37 usage/tables.py:55 +#: usage/tables.py:38 usage/tables.py:56 msgid "Usage Summary" msgstr "使用量摘要" -#: usage/tables.py:47 +#: usage/tables.py:48 msgid "Uptime" msgstr "上機時間" diff --git a/horizon/tests/test_data/keystone_data.py b/horizon/tests/test_data/keystone_data.py index 607332c83..d554d01da 100644 --- a/horizon/tests/test_data/keystone_data.py +++ b/horizon/tests/test_data/keystone_data.py @@ -88,7 +88,8 @@ def data(TEST): user_dict = {'id': "1", 'name': 'test_user', 'email': 'test@example.com', - 'password': 'password'} + 'password': 'password', + 'token': 'test_token'} user = users.User(users.UserManager, user_dict) user_dict.update({'id': "2", 'name': 'user_two', diff --git a/openstack_dashboard/locale/es/LC_MESSAGES/django.po b/openstack_dashboard/locale/es/LC_MESSAGES/django.po index e83ccaf1b..67ea10a18 100644 --- a/openstack_dashboard/locale/es/LC_MESSAGES/django.po +++ b/openstack_dashboard/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-14 13:53-0700\n" +"POT-Creation-Date: 2012-03-14 14:44-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/openstack_dashboard/locale/fr/LC_MESSAGES/django.po b/openstack_dashboard/locale/fr/LC_MESSAGES/django.po index cd210cd14..be944da12 100644 --- a/openstack_dashboard/locale/fr/LC_MESSAGES/django.po +++ b/openstack_dashboard/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-14 13:53-0700\n" +"POT-Creation-Date: 2012-03-14 14:44-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/openstack_dashboard/locale/ja/LC_MESSAGES/django.po b/openstack_dashboard/locale/ja/LC_MESSAGES/django.po index efe14805e..c0aa26198 100644 --- a/openstack_dashboard/locale/ja/LC_MESSAGES/django.po +++ b/openstack_dashboard/locale/ja/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-14 13:53-0700\n" +"POT-Creation-Date: 2012-03-14 14:44-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/openstack_dashboard/locale/pl/LC_MESSAGES/django.po b/openstack_dashboard/locale/pl/LC_MESSAGES/django.po index 93e469986..7e0cf0198 100644 --- a/openstack_dashboard/locale/pl/LC_MESSAGES/django.po +++ b/openstack_dashboard/locale/pl/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-14 13:53-0700\n" +"POT-Creation-Date: 2012-03-14 14:44-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/openstack_dashboard/locale/pt/LC_MESSAGES/django.po b/openstack_dashboard/locale/pt/LC_MESSAGES/django.po index e83ccaf1b..67ea10a18 100644 --- a/openstack_dashboard/locale/pt/LC_MESSAGES/django.po +++ b/openstack_dashboard/locale/pt/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-14 13:53-0700\n" +"POT-Creation-Date: 2012-03-14 14:44-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/openstack_dashboard/locale/zh_CN/LC_MESSAGES/django.po b/openstack_dashboard/locale/zh_CN/LC_MESSAGES/django.po index a92feaffe..c70d96d7a 100644 --- a/openstack_dashboard/locale/zh_CN/LC_MESSAGES/django.po +++ b/openstack_dashboard/locale/zh_CN/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-14 13:53-0700\n" +"POT-Creation-Date: 2012-03-14 14:44-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/openstack_dashboard/locale/zh_TW/LC_MESSAGES/django.po b/openstack_dashboard/locale/zh_TW/LC_MESSAGES/django.po index f9e679af5..b91efb0be 100644 --- a/openstack_dashboard/locale/zh_TW/LC_MESSAGES/django.po +++ b/openstack_dashboard/locale/zh_TW/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-14 13:53-0700\n" +"POT-Creation-Date: 2012-03-14 14:44-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"