From 56d98e5fe28c4e9de4a77a78a63347d68c4e3142 Mon Sep 17 00:00:00 2001 From: Emma Steimann Date: Sun, 4 Mar 2012 00:35:21 -0600 Subject: [PATCH] Created a new detail view for volumes (like instance details). * fixes bug 944497 and fixes bug 953464. Change-Id: Idea17ab07f4fa46b72af6b54017899cbfe7e6ef0 --- .../instances_and_volumes/volumes/tables.py | 3 + .../instances_and_volumes/volumes/tabs.py | 47 ++ .../instances_and_volumes/volumes/tests.py | 16 + .../instances_and_volumes/volumes/urls.py | 7 +- .../instances_and_volumes/volumes/views.py | 28 +- .../instances/detail.html | 3 +- .../instances/update.html | 2 +- .../volumes/_detail_overview.html | 49 ++ .../instances_and_volumes/volumes/detail.html | 45 +- .../dashboards/syspanel/services/tables.py | 5 +- horizon/dashboards/syspanel/services/views.py | 6 - horizon/locale/es/LC_MESSAGES/django.po | 411 ++++++++------- horizon/locale/fr/LC_MESSAGES/django.po | 411 ++++++++------- horizon/locale/ja/LC_MESSAGES/django.po | 474 +++++++++++------- horizon/locale/pl/LC_MESSAGES/django.po | 449 ++++++++++------- horizon/locale/pt/LC_MESSAGES/django.po | 411 ++++++++------- horizon/locale/zh_CN/LC_MESSAGES/django.po | 411 ++++++++------- horizon/locale/zh_TW/LC_MESSAGES/django.po | 465 ++++++++++------- horizon/tabs/base.py | 7 +- horizon/tabs/views.py | 4 +- .../locale/es/LC_MESSAGES/django.po | 2 +- .../locale/fr/LC_MESSAGES/django.po | 2 +- .../locale/ja/LC_MESSAGES/django.po | 2 +- .../locale/pl/LC_MESSAGES/django.po | 2 +- .../locale/pt/LC_MESSAGES/django.po | 2 +- .../locale/zh_CN/LC_MESSAGES/django.po | 2 +- .../locale/zh_TW/LC_MESSAGES/django.po | 2 +- 27 files changed, 1868 insertions(+), 1400 deletions(-) create mode 100644 horizon/dashboards/nova/instances_and_volumes/volumes/tabs.py create mode 100644 horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html diff --git a/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py b/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py index 3eb809b11b..bae920b8fd 100644 --- a/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py +++ b/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py @@ -130,6 +130,9 @@ class VolumesTableBase(tables.DataTable): class VolumesTable(VolumesTableBase): + name = tables.Column("displayName", + verbose_name=_("Name"), + link="%s:volumes:detail" % URL_PREFIX) attachments = tables.Column(get_attachment, verbose_name=_("Attachments")) diff --git a/horizon/dashboards/nova/instances_and_volumes/volumes/tabs.py b/horizon/dashboards/nova/instances_and_volumes/volumes/tabs.py new file mode 100644 index 0000000000..5f3dc1f6c3 --- /dev/null +++ b/horizon/dashboards/nova/instances_and_volumes/volumes/tabs.py @@ -0,0 +1,47 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2012 Nebula, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +from django.core.urlresolvers import reverse +from django.utils.translation import ugettext as _ + +from horizon import api +from horizon import exceptions +from horizon import tabs + + +class OverviewTab(tabs.Tab): + name = _("Overview") + slug = "overview" + template_name = ("nova/instances_and_volumes/volumes/" + "_detail_overview.html") + + def get_context_data(self, request): + volume_id = self.tab_group.kwargs['volume_id'] + try: + volume = api.nova.volume_get(request, volume_id) + for att in volume.attachments: + att['instance'] = api.nova.server_get(request, att['serverId']) + except: + redirect = reverse('horizon:nova:instances_and_volumes:index') + exceptions.handle(self.request, + _('Unable to retrieve volume details.'), + redirect=redirect) + return {'volume': volume} + + +class ImageDetailTabs(tabs.TabGroup): + slug = "image_details" + tabs = (OverviewTab,) diff --git a/horizon/dashboards/nova/instances_and_volumes/volumes/tests.py b/horizon/dashboards/nova/instances_and_volumes/volumes/tests.py index 617cbfdcef..9ef8adc1c3 100644 --- a/horizon/dashboards/nova/instances_and_volumes/volumes/tests.py +++ b/horizon/dashboards/nova/instances_and_volumes/volumes/tests.py @@ -45,3 +45,19 @@ class VolumeViewTests(test.TestCase): self.assertEqual(len(res.context['form'].fields['instance']._choices), 2) self.assertEqual(res.status_code, 200) + + def test_detail_view(self): + volume = self.volumes.first() + server = self.servers.first() + volume.attachments = [{"serverId": server.id}] + self.mox.StubOutWithMock(api.nova, 'volume_get') + self.mox.StubOutWithMock(api.nova, 'server_get') + api.nova.volume_get(IsA(http.HttpRequest), volume.id).AndReturn(volume) + api.nova.server_get(IsA(http.HttpRequest), server.id).AndReturn(server) + self.mox.ReplayAll() + + url = reverse('horizon:nova:instances_and_volumes:volumes:detail', + args=[volume.id]) + res = self.client.get(url) + self.assertEqual(res.status_code, 200) + self.assertNoMessages() diff --git a/horizon/dashboards/nova/instances_and_volumes/volumes/urls.py b/horizon/dashboards/nova/instances_and_volumes/volumes/urls.py index 7a2f73f74a..90f07357c4 100644 --- a/horizon/dashboards/nova/instances_and_volumes/volumes/urls.py +++ b/horizon/dashboards/nova/instances_and_volumes/volumes/urls.py @@ -16,7 +16,8 @@ from django.conf.urls.defaults import patterns, url -from .views import CreateView, EditAttachmentsView, CreateSnapshotView +from .views import (CreateView, EditAttachmentsView, DetailView, + CreateSnapshotView) urlpatterns = patterns( @@ -28,5 +29,7 @@ urlpatterns = patterns( url(r'^(?P[^/]+)/create_snapshot/$', CreateSnapshotView.as_view(), name='create_snapshot'), - url(r'^(?P[^/]+)/detail/$', 'detail', name='detail'), + url(r'^(?P[^/]+)/detail/$', + DetailView.as_view(), + name='detail'), ) diff --git a/horizon/dashboards/nova/instances_and_volumes/volumes/views.py b/horizon/dashboards/nova/instances_and_volumes/volumes/views.py index 05276f15c1..c33103c4a9 100644 --- a/horizon/dashboards/nova/instances_and_volumes/volumes/views.py +++ b/horizon/dashboards/nova/instances_and_volumes/volumes/views.py @@ -20,42 +20,24 @@ Views for managing Nova volumes. import logging -from django import shortcuts -from django.contrib import messages from django.utils.translation import ugettext as _ -from novaclient import exceptions as novaclient_exceptions from horizon import api from horizon import exceptions from horizon import forms from horizon import tables +from horizon import tabs from .forms import CreateForm, AttachForm, CreateSnapshotForm from .tables import AttachmentsTable +from .tabs import ImageDetailTabs LOG = logging.getLogger(__name__) -def detail(request, volume_id): - try: - volume = api.volume_get(request, volume_id) - attachment = volume.attachments[0] - if attachment: - instance = api.server_get( - request, volume.attachments[0]['serverId']) - else: - instance = None - except novaclient_exceptions.ClientException, e: - LOG.exception("ClientException in volume get") - messages.error(request, _('Error fetching volume: %s') % e.message) - return shortcuts.redirect( - 'horizon:nova:instances_and_volumes:volumes:index') - - return shortcuts.render(request, - 'nova/instances_and_volumes/volumes/detail.html', { - 'volume': volume, - 'attachment': attachment, - 'instance': instance}) +class DetailView(tabs.TabView): + tab_group_class = ImageDetailTabs + template_name = 'nova/instances_and_volumes/volumes/detail.html' class CreateView(forms.ModalFormView): diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/detail.html b/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/detail.html index a8eb486382..b2f85ddfb3 100644 --- a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/detail.html +++ b/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/detail.html @@ -1,9 +1,8 @@ {% extends 'nova/base.html' %} {% load i18n sizeformat %} -{% block title %}Instance Detail{% endblock %} +{% block title %}{% trans "Instance Detail" %}{% endblock %} {% block page_header %} - {# to make searchable false, just remove it from the include statement #} {% include "horizon/common/_page_header.html" with title="Instance Detail: "|add:instance.name %} {% endblock page_header %} diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/update.html b/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/update.html index e37361083d..f87493ac7d 100644 --- a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/update.html +++ b/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/update.html @@ -1,6 +1,6 @@ {% extends 'nova/base.html' %} {% load i18n %} -{% block title %}Update Instance{% endblock %} +{% block title %}{% trans "Update Instance" %}{% endblock %} {% block page_header %} {% include "horizon/common/_page_header.html" with title=_("Update Instance") %} diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html b/horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html new file mode 100644 index 0000000000..2a5fa2a28e --- /dev/null +++ b/horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html @@ -0,0 +1,49 @@ +{% load i18n sizeformat parse_date %} + +

{% trans "Volume Overview" %}: {{volume.displayName }}

+ +
+

{% trans "Info" %}

+
+
    +
  • {% trans "Volume Name:" %} {{ volume.displayName }}
    • +
  • {% trans "Volume ID" %}: {{ volume.id }}
    • + {% if volume.displayDescription %} +
  • {% trans "Description:" %} {{ volume.displayDescription }}
    • + {% endif %} +
+
+ +
+

{% trans "Status" %}

+
+
    +
  • {% trans "Status" %}: {{ volume.status|capfirst }}
    • +
+
+ +
+

{% trans "Specs" %}

+
+
    +
  • {% trans "Size:" %} {{ volume.size }} {% trans "GB" %}
    • +
  • {% trans "Created at:" %} {{ volume.createdAt|parse_date }}
    • +
+
+ +
+

{% trans "Attachments" %}

+
+ +
diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html b/horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html index 8a532c17c0..22633b5594 100644 --- a/horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html +++ b/horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html @@ -1,46 +1,15 @@ {% extends 'nova/base.html' %} -{% load i18n parse_date %} -{% block title %}Volume Details{% endblock %} +{% load i18n %} +{% block title %}{% trans "Volume Details" %}{% endblock %} {% block page_header %} - {# to make searchable false, just remove it from the include statement #} - {% include "horizon/common/_page_header.html" with title="Volume Detail: "|add:volume.displayName %} + {% include "horizon/common/_page_header.html" with title=_("Volume Detail") %} {% endblock page_header %} {% block dash_main %} - - -
-
-
    -
  • -
    -

    {% trans "Details" %}

    -
      -
    • {% trans "ID:" %} {{ volume.id }}
      • -
    • {% trans "Name:" %} {{ volume.displayName }}
      • -
    • {% trans "Size:" %} {{ volume.size }} {% trans "GB" %}
      • -
    • {% trans "Description:" %} {{ volume.displayDescription }}
      • -
    • {% trans "Status:" %} {{ volume.status|capfirst }}
      • -
    • {% trans "Created:" %} {{ volume.createdAt|parse_date }}
      • -
    • - {% trans "Attached To:" %} - {% if instance %} - - {% trans "Instance" %} {{ instance.id }} - ({{ instance.name }}) - - {% trans "on" %} {{ attachment.device }} - {% else %} - {% trans "Not Attached" %} - {% endif %} -
      • -
    -
    -
    • -
-
+
+
+ {{ tab_group.render }}
+
{% endblock %} diff --git a/horizon/dashboards/syspanel/services/tables.py b/horizon/dashboards/syspanel/services/tables.py index f53da17266..3f4e59c881 100644 --- a/horizon/dashboards/syspanel/services/tables.py +++ b/horizon/dashboards/syspanel/services/tables.py @@ -36,8 +36,9 @@ def get_enabled(service, reverse=False): def get_service_name(service): if(service.type == "identity"): - return _("%s (%s backend)") % (service.type, - api.keystone_backend_name()) + return _("%(type)s (%(backend)s backend)") \ + % {"type": service.type, + "backend": api.keystone_backend_name()} else: return service.type diff --git a/horizon/dashboards/syspanel/services/views.py b/horizon/dashboards/syspanel/services/views.py index 8c52b1de40..9b73c8bfc6 100644 --- a/horizon/dashboards/syspanel/services/views.py +++ b/horizon/dashboards/syspanel/services/views.py @@ -19,14 +19,8 @@ # under the License. import logging -import os -import subprocess import urlparse -from django import shortcuts -from django.contrib import messages -from django.utils.translation import ugettext as _ - from horizon import api from horizon import tables from .tables import ServicesTable diff --git a/horizon/locale/es/LC_MESSAGES/django.po b/horizon/locale/es/LC_MESSAGES/django.po index 2361b2950f..53bace1aac 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-10 09:27+0800\n" +"POT-Creation-Date: 2012-03-13 18:36-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -75,8 +75,8 @@ msgstr "" #: 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:131 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:32 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:164 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:42 msgid "Instance" msgstr "" @@ -114,6 +114,7 @@ msgid "Released" msgstr "" #: dashboards/nova/access_and_security/floating_ips/tables.py:46 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:22 msgid "Floating IP" msgstr "" @@ -142,8 +143,8 @@ 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:207 -#: dashboards/syspanel/instances/tables.py:49 +#: dashboards/nova/instances_and_volumes/instances/tables.py:211 +#: dashboards/syspanel/instances/tables.py:53 msgid "IP Address" msgstr "" @@ -160,7 +161,7 @@ msgstr "" msgid "Unable to retrieve instance list." msgstr "" -#: dashboards/nova/access_and_security/floating_ips/views.py:92 +#: dashboards/nova/access_and_security/floating_ips/views.py:100 msgid "No floating IP pools available." msgstr "" @@ -314,7 +315,8 @@ msgstr "" #: dashboards/nova/access_and_security/security_groups/tables.py:31 #: dashboards/nova/access_and_security/security_groups/tables.py:65 -#: dashboards/nova/images_and_snapshots/images/forms.py:108 +#: dashboards/nova/images_and_snapshots/images/forms.py:107 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:40 msgid "Security Groups" msgstr "" @@ -331,19 +333,20 @@ 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:89 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:117 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:133 #: 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/users/forms.py:51 +#: dashboards/syspanel/users/forms.py:63 msgid "Name" 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:91 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:120 #: 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 @@ -399,7 +402,7 @@ msgid "Slash is not an allowed character." msgstr "" #: dashboards/nova/containers/forms.py:45 -#: dashboards/nova/containers/tables.py:101 +#: dashboards/nova/containers/tables.py:103 msgid "Container Name" msgstr "" @@ -412,7 +415,7 @@ msgid "Unable to create container." msgstr "" #: dashboards/nova/containers/forms.py:59 -#: dashboards/nova/containers/tables.py:182 +#: dashboards/nova/containers/tables.py:169 msgid "Object Name" msgstr "" @@ -446,76 +449,64 @@ msgid "Unable to copy object." msgstr "" #: dashboards/nova/containers/panel.py:28 -#: dashboards/nova/containers/tables.py:112 +#: dashboards/nova/containers/tables.py:37 +#: dashboards/nova/containers/tables.py:114 #: dashboards/nova/templates/nova/containers/index.html:8 msgid "Containers" msgstr "" -#: dashboards/nova/containers/tables.py:37 -#: dashboards/nova/containers/tables.py:119 tables/actions.py:523 -msgid "Delete" +#: dashboards/nova/containers/tables.py:36 +msgid "Container" msgstr "" -#: dashboards/nova/containers/tables.py:38 -msgid "Delete Containers" -msgstr "" - -#: dashboards/nova/containers/tables.py:51 +#: dashboards/nova/containers/tables.py:53 #, python-format msgid "Unable to delete non-empty container: %s" msgstr "" -#: dashboards/nova/containers/tables.py:55 +#: dashboards/nova/containers/tables.py:57 #, python-format msgid "Successfully deleted containers: %s" msgstr "" -#: dashboards/nova/containers/tables.py:62 +#: dashboards/nova/containers/tables.py:64 #: 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:69 +#: dashboards/nova/containers/tables.py:71 msgid "List Objects" msgstr "" -#: dashboards/nova/containers/tables.py:75 +#: dashboards/nova/containers/tables.py:77 #: dashboards/nova/templates/nova/objects/_upload.html:23 msgid "Upload Object" msgstr "" -#: dashboards/nova/containers/tables.py:103 -#: dashboards/nova/containers/tables.py:190 +#: dashboards/nova/containers/tables.py:105 +#: dashboards/nova/containers/tables.py:121 +#: dashboards/nova/containers/tables.py:177 msgid "Objects" msgstr "" -#: dashboards/nova/containers/tables.py:105 -#: dashboards/nova/containers/tables.py:183 -#: dashboards/nova/instances_and_volumes/instances/tables.py:208 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:92 -#: dashboards/syspanel/instances/tables.py:50 +#: dashboards/nova/containers/tables.py:107 +#: dashboards/nova/containers/tables.py:170 +#: dashboards/nova/instances_and_volumes/instances/tables.py:212 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:121 +#: dashboards/syspanel/instances/tables.py:54 msgid "Size" msgstr "" #: dashboards/nova/containers/tables.py:120 -msgid "Delete Objects" +msgid "Object" msgstr "" -#: dashboards/nova/containers/tables.py:132 -msgid "Unable to delete object." -msgstr "" - -#: dashboards/nova/containers/tables.py:135 -#, python-format -msgid "Successfully deleted objects: %s" -msgstr "" - -#: dashboards/nova/containers/tables.py:143 +#: dashboards/nova/containers/tables.py:131 msgid "Copy" msgstr "" -#: dashboards/nova/containers/tables.py:154 +#: dashboards/nova/containers/tables.py:142 msgid "Download" msgstr "" @@ -603,44 +594,52 @@ msgstr "" msgid "Instance Count" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:106 +#: dashboards/nova/images_and_snapshots/images/forms.py:105 msgid "Number of instances to launch." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:112 +#: dashboards/nova/images_and_snapshots/images/forms.py:111 msgid "Launch instance in these security groups." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:114 +#: dashboards/nova/images_and_snapshots/images/forms.py:113 msgid "Volume or Volume Snapshot" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:116 +#: dashboards/nova/images_and_snapshots/images/forms.py:115 msgid "Volume to boot from." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:117 +#: dashboards/nova/images_and_snapshots/images/forms.py:116 msgid "Device Name" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:120 +#: dashboards/nova/images_and_snapshots/images/forms.py:119 msgid "Volume mount point (e.g. 'vda' mounts at '/dev/vda')." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:123 +#: dashboards/nova/images_and_snapshots/images/forms.py:122 msgid "Delete on Terminate" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:126 +#: dashboards/nova/images_and_snapshots/images/forms.py:125 msgid "Delete volume on instance terminate" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:161 +#: dashboards/nova/images_and_snapshots/images/forms.py:131 +msgid "Select a keypair" +msgstr "" + +#: dashboards/nova/images_and_snapshots/images/forms.py:133 +msgid "No keypairs available." +msgstr "" + +#: dashboards/nova/images_and_snapshots/images/forms.py:164 #, python-format msgid "Instance \"%s\" launched." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:165 +#: dashboards/nova/images_and_snapshots/images/forms.py:168 #, python-format msgid "Unable to launch instance: %(exc)s" msgstr "" @@ -666,17 +665,19 @@ msgid "Edit" msgstr "" #: dashboards/nova/images_and_snapshots/images/tables.py:71 -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:44 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:63 msgid "Image Name" msgstr "" #: dashboards/nova/images_and_snapshots/images/tables.py:76 -#: dashboards/nova/instances_and_volumes/instances/tables.py:210 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:94 +#: dashboards/nova/instances_and_volumes/instances/tables.py:215 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:124 #: 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 -#: dashboards/syspanel/instances/tables.py:52 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:18 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:21 +#: dashboards/syspanel/instances/tables.py:57 msgid "Status" msgstr "" @@ -684,48 +685,48 @@ msgstr "" msgid "Public" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:59 -#: dashboards/nova/images_and_snapshots/images/views.py:159 +#: dashboards/nova/images_and_snapshots/images/views.py:57 +#: dashboards/nova/images_and_snapshots/images/views.py:157 #, python-format msgid "Unable to retrieve image \"%s\"." msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:88 +#: dashboards/nova/images_and_snapshots/images/views.py:86 msgid "Unable to retrieve instance flavors." msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:98 +#: dashboards/nova/images_and_snapshots/images/views.py:96 msgid "Unable to retrieve keypairs." msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:107 +#: dashboards/nova/images_and_snapshots/images/views.py:105 msgid "Unable to retrieve list of security groups" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:112 +#: dashboards/nova/images_and_snapshots/images/views.py:110 msgid "Select Volume" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:117 +#: 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 msgid "Snapshot" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:120 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:34 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:118 -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:55 +#: 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:151 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:74 msgid "Volume" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:134 -#: dashboards/nova/images_and_snapshots/images/views.py:145 +#: dashboards/nova/images_and_snapshots/images/views.py:132 +#: dashboards/nova/images_and_snapshots/images/views.py:143 msgid "Unable to retrieve list of volumes" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:183 -#: dashboards/nova/instances_and_volumes/instances/views.py:115 +#: dashboards/nova/images_and_snapshots/images/views.py:182 +#: dashboards/nova/instances_and_volumes/instances/views.py:117 #, python-format msgid "Unable to retrieve details for instance \"%s\"." msgstr "" @@ -771,6 +772,7 @@ msgid "Volume Snapshots" msgstr "" #: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:39 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:10 msgid "Volume ID" msgstr "" @@ -809,8 +811,8 @@ msgstr "" #: 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:222 -#: dashboards/syspanel/instances/tables.py:64 +#: dashboards/nova/instances_and_volumes/instances/tables.py:229 +#: dashboards/syspanel/instances/tables.py:71 #: dashboards/syspanel/projects/forms.py:115 #: dashboards/syspanel/templates/syspanel/instances/index.html:3 msgid "Instances" @@ -883,24 +885,24 @@ msgstr "" msgid "Not available" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:206 +#: dashboards/nova/instances_and_volumes/instances/tables.py:210 #: 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:52 usage/tables.py:45 msgid "Instance Name" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:212 -#: dashboards/syspanel/instances/tables.py:54 +#: dashboards/nova/instances_and_volumes/instances/tables.py:219 +#: dashboards/syspanel/instances/tables.py:61 msgid "Task" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:218 -#: dashboards/syspanel/instances/tables.py:60 +#: dashboards/nova/instances_and_volumes/instances/tables.py:225 +#: dashboards/syspanel/instances/tables.py:67 msgid "Power State" msgstr "" #: dashboards/nova/instances_and_volumes/instances/tabs.py:25 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:12 +#: dashboards/nova/instances_and_volumes/volumes/tabs.py:26 #: dashboards/nova/templates/nova/overview/usage.html:6 #: dashboards/syspanel/templates/syspanel/overview/usage.html:6 msgid "Overview" @@ -961,55 +963,59 @@ msgstr "" msgid "Error Creating Volume Snapshot: %(exc)s" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:35 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:109 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:119 -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:49 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:36 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:140 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:152 +#: 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:44 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:53 +msgid "Volumes in error states cannot be deleted via the Nova API." +msgstr "" + +#: dashboards/nova/instances_and_volumes/volumes/tables.py:59 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_create.html:23 msgid "Create Volume" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:51 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:66 msgid "Edit Attachments" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:60 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:76 #: 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:69 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:91 #: templatetags/sizeformat.py:58 #, python-format msgid "%s GB" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:105 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:136 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:35 msgid "Attachments" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:116 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:149 msgid "Detach" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:117 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:150 msgid "Detached" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/views.py:50 -#, python-format -msgid "Error fetching volume: %s" +#: dashboards/nova/instances_and_volumes/volumes/tabs.py:40 +msgid "Unable to retrieve volume details." msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/views.py:89 -#: dashboards/nova/instances_and_volumes/volumes/views.py:99 +#: dashboards/nova/instances_and_volumes/volumes/views.py:72 +#: dashboards/nova/instances_and_volumes/volumes/views.py:82 msgid "Unable to retrieve volume information." msgstr "" @@ -1017,33 +1023,46 @@ msgstr "" msgid "Access & Security" msgstr "" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:7 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:8 #: dashboards/nova/templates/nova/access_and_security/floating_ips/allocate.html:3 msgid "Allocate Floating IP" msgstr "" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:16 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:17 #: dashboards/nova/templates/nova/access_and_security/floating_ips/_associate.html:16 #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:18 #: dashboards/nova/templates/nova/images_and_snapshots/images/_update.html:16 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html:17 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_update.html:16 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:25 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:12 #: dashboards/settings/templates/settings/ec2/download_form.html:17 #: dashboards/settings/templates/settings/project/_openrc.html:17 #: dashboards/settings/templates/settings/user/_language.html:30 msgid "Description:" msgstr "" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:17 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:18 msgid "Allocate a floating IP from a given floating ip pool." msgstr "" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:22 -msgid "Allocate IP" +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:20 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:20 +msgid "Project Quotas" msgstr "" #: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:23 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:24 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:31 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:38 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:45 +msgid "Available" +msgstr "" + +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:31 +msgid "Allocate IP" +msgstr "" + +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:32 #: dashboards/nova/templates/nova/access_and_security/floating_ips/_associate.html:23 #: dashboards/nova/templates/nova/access_and_security/keypairs/_create.html:24 #: dashboards/nova/templates/nova/access_and_security/keypairs/_import.html:24 @@ -1152,17 +1171,6 @@ msgid "" "resources used by this project in relation to the project's quotas." msgstr "" -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:20 -msgid "Project Quotas" -msgstr "" - -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:24 -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:31 -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:38 -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:45 -msgid "Available" -msgstr "" - #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:30 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:20 #: dashboards/syspanel/flavors/forms.py:38 @@ -1180,7 +1188,7 @@ msgstr "" #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:37 #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:38 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:21 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:24 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:29 msgid "GB" msgstr "" @@ -1243,11 +1251,12 @@ msgstr "" #: dashboards/nova/templates/nova/images_and_snapshots/images/detail.html:24 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:16 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:26 msgid "Specs" msgstr "" #: dashboards/nova/templates/nova/images_and_snapshots/images/detail.html:26 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:24 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:29 msgid "Size:" msgstr "" @@ -1308,7 +1317,7 @@ msgid "Instance Overview" msgstr "" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:11 -#: dashboards/syspanel/instances/tables.py:44 +#: dashboards/syspanel/instances/tables.py:48 msgid "Instance ID" msgstr "" @@ -1325,15 +1334,19 @@ msgstr "" msgid "IP Addresses" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:40 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:50 +msgid "No rules defined." +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:59 msgid "Meta" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:43 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:62 msgid "Key name" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:62 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:81 msgid "No volumes attached." msgstr "" @@ -1352,10 +1365,15 @@ msgid "Update the name of your instance" msgstr "" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_update.html:22 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/update.html:3 #: dashboards/nova/templates/nova/instances_and_volumes/instances/update.html:6 msgid "Update Instance" msgstr "" +#: dashboards/nova/templates/nova/instances_and_volumes/instances/detail.html:3 +msgid "Instance Detail" +msgstr "" + #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_attach.html:9 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/attach.html:6 msgid "Manage Volume Attachments" @@ -1380,6 +1398,34 @@ msgstr "" msgid "Create Volume Snapshot" msgstr "" +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:3 +msgid "Volume Overview" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:6 +msgid "Info" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:9 +msgid "Volume Name:" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:30 +msgid "Created at:" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:40 +msgid "Attached To:" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:43 +msgid "on" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:46 +msgid "Not attached" +msgstr "" + #: dashboards/nova/templates/nova/instances_and_volumes/volumes/create.html:6 msgid "Create a Volume" msgstr "" @@ -1388,36 +1434,12 @@ msgstr "" msgid "Create a Volume Snapshot" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:20 -msgid "Details" +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:3 +msgid "Volume Details" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:22 -msgid "ID:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:23 -msgid "Name:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:26 -msgid "Status:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:27 -msgid "Created:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:29 -msgid "Attached To:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:35 -msgid "on" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:37 -msgid "Not Attached" +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:6 +msgid "Volume Detail" msgstr "" #: dashboards/nova/templates/nova/objects/_copy.html:17 @@ -1582,18 +1604,18 @@ msgstr "" msgid "Unable to retrieve image list." msgstr "" -#: dashboards/syspanel/instances/tables.py:41 +#: dashboards/syspanel/instances/tables.py:45 msgid "Tenant" msgstr "" -#: dashboards/syspanel/instances/tables.py:42 +#: dashboards/syspanel/instances/tables.py:46 #: dashboards/syspanel/projects/tables.py:89 #: dashboards/syspanel/users/tables.py:90 msgid "User" msgstr "" -#: dashboards/syspanel/instances/tables.py:45 -#: dashboards/syspanel/services/tables.py:42 +#: dashboards/syspanel/instances/tables.py:49 +#: dashboards/syspanel/services/tables.py:49 msgid "Host" msgstr "" @@ -1612,7 +1634,7 @@ msgstr "" #: dashboards/syspanel/projects/forms.py:64 #: dashboards/syspanel/projects/forms.py:89 #: dashboards/syspanel/projects/tables.py:75 -#: dashboards/syspanel/services/tables.py:44 +#: dashboards/syspanel/services/tables.py:51 #: dashboards/syspanel/users/tables.py:127 msgid "Enabled" msgstr "" @@ -1627,7 +1649,7 @@ msgid "Unable to create tenant." msgstr "" #: dashboards/syspanel/projects/forms.py:83 -#: dashboards/syspanel/users/forms.py:87 +#: dashboards/syspanel/users/forms.py:105 #: dashboards/syspanel/users/tables.py:121 msgid "ID" msgstr "" @@ -1705,7 +1727,7 @@ msgid "Projects" msgstr "" #: dashboards/syspanel/projects/tables.py:71 -#: dashboards/syspanel/services/tables.py:40 +#: dashboards/syspanel/services/tables.py:47 msgid "Id" msgstr "" @@ -1765,11 +1787,16 @@ msgstr "" msgid "Unable to get quota info: %s" msgstr "" -#: dashboards/syspanel/services/tables.py:41 +#: dashboards/syspanel/services/tables.py:39 +#, python-format +msgid "%(type)s (%(backend)s backend)" +msgstr "" + +#: dashboards/syspanel/services/tables.py:48 msgid "Service" msgstr "" -#: dashboards/syspanel/services/tables.py:49 +#: dashboards/syspanel/services/tables.py:56 #: dashboards/syspanel/templates/syspanel/services/index.html:8 msgid "Services" msgstr "" @@ -1875,64 +1902,75 @@ msgid "" "and default project." msgstr "" -#: dashboards/syspanel/users/forms.py:39 +#: dashboards/syspanel/users/forms.py:41 msgid "Select a project" msgstr "" -#: dashboards/syspanel/users/forms.py:52 dashboards/syspanel/users/forms.py:89 +#: dashboards/syspanel/users/forms.py:58 +msgid "Passwords do not match." +msgstr "" + +#: dashboards/syspanel/users/forms.py:64 +#: dashboards/syspanel/users/forms.py:107 #: dashboards/syspanel/users/tables.py:123 msgid "Email" msgstr "" -#: dashboards/syspanel/users/forms.py:53 dashboards/syspanel/users/forms.py:90 -#: views/auth_forms.py:65 +#: dashboards/syspanel/users/forms.py:66 +#: dashboards/syspanel/users/forms.py:108 views/auth_forms.py:65 msgid "Password" msgstr "" -#: dashboards/syspanel/users/forms.py:56 dashboards/syspanel/users/forms.py:93 +#: dashboards/syspanel/users/forms.py:71 +#: dashboards/syspanel/users/forms.py:112 +msgid "Confirm Password" +msgstr "" + +#: dashboards/syspanel/users/forms.py:74 +#: dashboards/syspanel/users/forms.py:114 msgid "Primary Project" msgstr "" -#: dashboards/syspanel/users/forms.py:68 +#: dashboards/syspanel/users/forms.py:86 #, python-format msgid "User \"%s\" was successfully created." msgstr "" -#: dashboards/syspanel/users/forms.py:79 +#: dashboards/syspanel/users/forms.py:97 msgid "Unable to add user to primary project." msgstr "" -#: dashboards/syspanel/users/forms.py:82 +#: dashboards/syspanel/users/forms.py:100 msgid "Unable to create user." msgstr "" -#: dashboards/syspanel/users/forms.py:88 +#: dashboards/syspanel/users/forms.py:106 #: dashboards/syspanel/users/tables.py:122 views/auth_forms.py:64 msgid "User Name" msgstr "" -#: dashboards/syspanel/users/forms.py:104 +#: dashboards/syspanel/users/forms.py:125 msgid "name" msgstr "" -#: dashboards/syspanel/users/forms.py:104 +#: dashboards/syspanel/users/forms.py:125 msgid "email" msgstr "" -#: dashboards/syspanel/users/forms.py:113 +#: dashboards/syspanel/users/forms.py:134 msgid "primary project" msgstr "" -#: dashboards/syspanel/users/forms.py:124 +#: dashboards/syspanel/users/forms.py:145 msgid "password" msgstr "" -#: dashboards/syspanel/users/forms.py:134 +#: dashboards/syspanel/users/forms.py:155 #, python-format msgid "Updated %(attributes)s for \"%(user)s\"." msgstr "" -#: dashboards/syspanel/users/forms.py:139 +#: dashboards/syspanel/users/forms.py:160 #, python-format msgid "Unable to update %(attributes)s for \"%(user)s\"." msgstr "" @@ -1996,31 +2034,30 @@ msgstr "" msgid "Unable to update user." msgstr "" -#: tables/actions.py:280 +#: tables/actions.py:277 msgid "Update" msgstr "" -#: tables/actions.py:495 -#, python-format -msgid "Unable to %s." -msgstr "" - -#: tables/actions.py:501 +#: tables/actions.py:506 #, python-format msgid "You do not have permission to %(action)s: %(objs)s" msgstr "" -#: tables/actions.py:507 +#: tables/actions.py:512 #, python-format msgid "Unable to %(action)s: %(objs)s" msgstr "" -#: tables/actions.py:513 +#: tables/actions.py:518 #, python-format msgid "%(action)s: %(objs)s" msgstr "" -#: tables/actions.py:524 +#: tables/actions.py:528 +msgid "Delete" +msgstr "" + +#: tables/actions.py:529 msgid "Deleted" msgstr "" @@ -2224,11 +2261,15 @@ msgstr "" msgid "Invalid user name or password." msgstr "" -#: views/auth_forms.py:136 +#: views/auth_forms.py:122 +msgid "An error occurred authenticating. Please try again later." +msgstr "" + +#: views/auth_forms.py:141 #, python-format msgid "No tenants present for user: %(user)s" msgstr "" -#: views/auth_forms.py:160 +#: views/auth_forms.py:165 msgid "You are not authorized for any available tenants." msgstr "" diff --git a/horizon/locale/fr/LC_MESSAGES/django.po b/horizon/locale/fr/LC_MESSAGES/django.po index 79f0c471e5..a4e6eb4242 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-10 09:27+0800\n" +"POT-Creation-Date: 2012-03-13 18:36-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -75,8 +75,8 @@ msgstr "" #: 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:131 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:32 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:164 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:42 msgid "Instance" msgstr "" @@ -114,6 +114,7 @@ msgid "Released" msgstr "" #: dashboards/nova/access_and_security/floating_ips/tables.py:46 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:22 msgid "Floating IP" msgstr "" @@ -142,8 +143,8 @@ 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:207 -#: dashboards/syspanel/instances/tables.py:49 +#: dashboards/nova/instances_and_volumes/instances/tables.py:211 +#: dashboards/syspanel/instances/tables.py:53 msgid "IP Address" msgstr "" @@ -160,7 +161,7 @@ msgstr "" msgid "Unable to retrieve instance list." msgstr "" -#: dashboards/nova/access_and_security/floating_ips/views.py:92 +#: dashboards/nova/access_and_security/floating_ips/views.py:100 msgid "No floating IP pools available." msgstr "" @@ -314,7 +315,8 @@ msgstr "" #: dashboards/nova/access_and_security/security_groups/tables.py:31 #: dashboards/nova/access_and_security/security_groups/tables.py:65 -#: dashboards/nova/images_and_snapshots/images/forms.py:108 +#: dashboards/nova/images_and_snapshots/images/forms.py:107 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:40 msgid "Security Groups" msgstr "" @@ -331,19 +333,20 @@ 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:89 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:117 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:133 #: 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/users/forms.py:51 +#: dashboards/syspanel/users/forms.py:63 msgid "Name" 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:91 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:120 #: 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 @@ -399,7 +402,7 @@ msgid "Slash is not an allowed character." msgstr "" #: dashboards/nova/containers/forms.py:45 -#: dashboards/nova/containers/tables.py:101 +#: dashboards/nova/containers/tables.py:103 msgid "Container Name" msgstr "" @@ -412,7 +415,7 @@ msgid "Unable to create container." msgstr "" #: dashboards/nova/containers/forms.py:59 -#: dashboards/nova/containers/tables.py:182 +#: dashboards/nova/containers/tables.py:169 msgid "Object Name" msgstr "" @@ -446,76 +449,64 @@ msgid "Unable to copy object." msgstr "" #: dashboards/nova/containers/panel.py:28 -#: dashboards/nova/containers/tables.py:112 +#: dashboards/nova/containers/tables.py:37 +#: dashboards/nova/containers/tables.py:114 #: dashboards/nova/templates/nova/containers/index.html:8 msgid "Containers" msgstr "" -#: dashboards/nova/containers/tables.py:37 -#: dashboards/nova/containers/tables.py:119 tables/actions.py:523 -msgid "Delete" +#: dashboards/nova/containers/tables.py:36 +msgid "Container" msgstr "" -#: dashboards/nova/containers/tables.py:38 -msgid "Delete Containers" -msgstr "" - -#: dashboards/nova/containers/tables.py:51 +#: dashboards/nova/containers/tables.py:53 #, python-format msgid "Unable to delete non-empty container: %s" msgstr "" -#: dashboards/nova/containers/tables.py:55 +#: dashboards/nova/containers/tables.py:57 #, python-format msgid "Successfully deleted containers: %s" msgstr "" -#: dashboards/nova/containers/tables.py:62 +#: dashboards/nova/containers/tables.py:64 #: 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:69 +#: dashboards/nova/containers/tables.py:71 msgid "List Objects" msgstr "" -#: dashboards/nova/containers/tables.py:75 +#: dashboards/nova/containers/tables.py:77 #: dashboards/nova/templates/nova/objects/_upload.html:23 msgid "Upload Object" msgstr "" -#: dashboards/nova/containers/tables.py:103 -#: dashboards/nova/containers/tables.py:190 +#: dashboards/nova/containers/tables.py:105 +#: dashboards/nova/containers/tables.py:121 +#: dashboards/nova/containers/tables.py:177 msgid "Objects" msgstr "" -#: dashboards/nova/containers/tables.py:105 -#: dashboards/nova/containers/tables.py:183 -#: dashboards/nova/instances_and_volumes/instances/tables.py:208 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:92 -#: dashboards/syspanel/instances/tables.py:50 +#: dashboards/nova/containers/tables.py:107 +#: dashboards/nova/containers/tables.py:170 +#: dashboards/nova/instances_and_volumes/instances/tables.py:212 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:121 +#: dashboards/syspanel/instances/tables.py:54 msgid "Size" msgstr "" #: dashboards/nova/containers/tables.py:120 -msgid "Delete Objects" +msgid "Object" msgstr "" -#: dashboards/nova/containers/tables.py:132 -msgid "Unable to delete object." -msgstr "" - -#: dashboards/nova/containers/tables.py:135 -#, python-format -msgid "Successfully deleted objects: %s" -msgstr "" - -#: dashboards/nova/containers/tables.py:143 +#: dashboards/nova/containers/tables.py:131 msgid "Copy" msgstr "" -#: dashboards/nova/containers/tables.py:154 +#: dashboards/nova/containers/tables.py:142 msgid "Download" msgstr "" @@ -603,44 +594,52 @@ msgstr "" msgid "Instance Count" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:106 +#: dashboards/nova/images_and_snapshots/images/forms.py:105 msgid "Number of instances to launch." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:112 +#: dashboards/nova/images_and_snapshots/images/forms.py:111 msgid "Launch instance in these security groups." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:114 +#: dashboards/nova/images_and_snapshots/images/forms.py:113 msgid "Volume or Volume Snapshot" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:116 +#: dashboards/nova/images_and_snapshots/images/forms.py:115 msgid "Volume to boot from." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:117 +#: dashboards/nova/images_and_snapshots/images/forms.py:116 msgid "Device Name" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:120 +#: dashboards/nova/images_and_snapshots/images/forms.py:119 msgid "Volume mount point (e.g. 'vda' mounts at '/dev/vda')." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:123 +#: dashboards/nova/images_and_snapshots/images/forms.py:122 msgid "Delete on Terminate" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:126 +#: dashboards/nova/images_and_snapshots/images/forms.py:125 msgid "Delete volume on instance terminate" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:161 +#: dashboards/nova/images_and_snapshots/images/forms.py:131 +msgid "Select a keypair" +msgstr "" + +#: dashboards/nova/images_and_snapshots/images/forms.py:133 +msgid "No keypairs available." +msgstr "" + +#: dashboards/nova/images_and_snapshots/images/forms.py:164 #, python-format msgid "Instance \"%s\" launched." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:165 +#: dashboards/nova/images_and_snapshots/images/forms.py:168 #, python-format msgid "Unable to launch instance: %(exc)s" msgstr "" @@ -666,17 +665,19 @@ msgid "Edit" msgstr "" #: dashboards/nova/images_and_snapshots/images/tables.py:71 -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:44 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:63 msgid "Image Name" msgstr "" #: dashboards/nova/images_and_snapshots/images/tables.py:76 -#: dashboards/nova/instances_and_volumes/instances/tables.py:210 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:94 +#: dashboards/nova/instances_and_volumes/instances/tables.py:215 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:124 #: 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 -#: dashboards/syspanel/instances/tables.py:52 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:18 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:21 +#: dashboards/syspanel/instances/tables.py:57 msgid "Status" msgstr "" @@ -684,48 +685,48 @@ msgstr "" msgid "Public" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:59 -#: dashboards/nova/images_and_snapshots/images/views.py:159 +#: dashboards/nova/images_and_snapshots/images/views.py:57 +#: dashboards/nova/images_and_snapshots/images/views.py:157 #, python-format msgid "Unable to retrieve image \"%s\"." msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:88 +#: dashboards/nova/images_and_snapshots/images/views.py:86 msgid "Unable to retrieve instance flavors." msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:98 +#: dashboards/nova/images_and_snapshots/images/views.py:96 msgid "Unable to retrieve keypairs." msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:107 +#: dashboards/nova/images_and_snapshots/images/views.py:105 msgid "Unable to retrieve list of security groups" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:112 +#: dashboards/nova/images_and_snapshots/images/views.py:110 msgid "Select Volume" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:117 +#: 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 msgid "Snapshot" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:120 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:34 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:118 -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:55 +#: 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:151 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:74 msgid "Volume" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:134 -#: dashboards/nova/images_and_snapshots/images/views.py:145 +#: dashboards/nova/images_and_snapshots/images/views.py:132 +#: dashboards/nova/images_and_snapshots/images/views.py:143 msgid "Unable to retrieve list of volumes" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:183 -#: dashboards/nova/instances_and_volumes/instances/views.py:115 +#: dashboards/nova/images_and_snapshots/images/views.py:182 +#: dashboards/nova/instances_and_volumes/instances/views.py:117 #, python-format msgid "Unable to retrieve details for instance \"%s\"." msgstr "" @@ -771,6 +772,7 @@ msgid "Volume Snapshots" msgstr "" #: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:39 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:10 msgid "Volume ID" msgstr "" @@ -809,8 +811,8 @@ msgstr "" #: 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:222 -#: dashboards/syspanel/instances/tables.py:64 +#: dashboards/nova/instances_and_volumes/instances/tables.py:229 +#: dashboards/syspanel/instances/tables.py:71 #: dashboards/syspanel/projects/forms.py:115 #: dashboards/syspanel/templates/syspanel/instances/index.html:3 msgid "Instances" @@ -883,24 +885,24 @@ msgstr "" msgid "Not available" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:206 +#: dashboards/nova/instances_and_volumes/instances/tables.py:210 #: 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:52 usage/tables.py:45 msgid "Instance Name" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:212 -#: dashboards/syspanel/instances/tables.py:54 +#: dashboards/nova/instances_and_volumes/instances/tables.py:219 +#: dashboards/syspanel/instances/tables.py:61 msgid "Task" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:218 -#: dashboards/syspanel/instances/tables.py:60 +#: dashboards/nova/instances_and_volumes/instances/tables.py:225 +#: dashboards/syspanel/instances/tables.py:67 msgid "Power State" msgstr "" #: dashboards/nova/instances_and_volumes/instances/tabs.py:25 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:12 +#: dashboards/nova/instances_and_volumes/volumes/tabs.py:26 #: dashboards/nova/templates/nova/overview/usage.html:6 #: dashboards/syspanel/templates/syspanel/overview/usage.html:6 msgid "Overview" @@ -961,55 +963,59 @@ msgstr "" msgid "Error Creating Volume Snapshot: %(exc)s" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:35 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:109 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:119 -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:49 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:36 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:140 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:152 +#: 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:44 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:53 +msgid "Volumes in error states cannot be deleted via the Nova API." +msgstr "" + +#: dashboards/nova/instances_and_volumes/volumes/tables.py:59 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_create.html:23 msgid "Create Volume" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:51 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:66 msgid "Edit Attachments" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:60 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:76 #: 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:69 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:91 #: templatetags/sizeformat.py:58 #, python-format msgid "%s GB" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:105 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:136 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:35 msgid "Attachments" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:116 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:149 msgid "Detach" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:117 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:150 msgid "Detached" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/views.py:50 -#, python-format -msgid "Error fetching volume: %s" +#: dashboards/nova/instances_and_volumes/volumes/tabs.py:40 +msgid "Unable to retrieve volume details." msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/views.py:89 -#: dashboards/nova/instances_and_volumes/volumes/views.py:99 +#: dashboards/nova/instances_and_volumes/volumes/views.py:72 +#: dashboards/nova/instances_and_volumes/volumes/views.py:82 msgid "Unable to retrieve volume information." msgstr "" @@ -1017,33 +1023,46 @@ msgstr "" msgid "Access & Security" msgstr "" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:7 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:8 #: dashboards/nova/templates/nova/access_and_security/floating_ips/allocate.html:3 msgid "Allocate Floating IP" msgstr "" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:16 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:17 #: dashboards/nova/templates/nova/access_and_security/floating_ips/_associate.html:16 #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:18 #: dashboards/nova/templates/nova/images_and_snapshots/images/_update.html:16 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html:17 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_update.html:16 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:25 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:12 #: dashboards/settings/templates/settings/ec2/download_form.html:17 #: dashboards/settings/templates/settings/project/_openrc.html:17 #: dashboards/settings/templates/settings/user/_language.html:30 msgid "Description:" msgstr "" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:17 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:18 msgid "Allocate a floating IP from a given floating ip pool." msgstr "" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:22 -msgid "Allocate IP" +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:20 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:20 +msgid "Project Quotas" msgstr "" #: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:23 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:24 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:31 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:38 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:45 +msgid "Available" +msgstr "" + +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:31 +msgid "Allocate IP" +msgstr "" + +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:32 #: dashboards/nova/templates/nova/access_and_security/floating_ips/_associate.html:23 #: dashboards/nova/templates/nova/access_and_security/keypairs/_create.html:24 #: dashboards/nova/templates/nova/access_and_security/keypairs/_import.html:24 @@ -1152,17 +1171,6 @@ msgid "" "resources used by this project in relation to the project's quotas." msgstr "" -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:20 -msgid "Project Quotas" -msgstr "" - -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:24 -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:31 -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:38 -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:45 -msgid "Available" -msgstr "" - #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:30 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:20 #: dashboards/syspanel/flavors/forms.py:38 @@ -1180,7 +1188,7 @@ msgstr "" #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:37 #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:38 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:21 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:24 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:29 msgid "GB" msgstr "" @@ -1243,11 +1251,12 @@ msgstr "" #: dashboards/nova/templates/nova/images_and_snapshots/images/detail.html:24 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:16 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:26 msgid "Specs" msgstr "" #: dashboards/nova/templates/nova/images_and_snapshots/images/detail.html:26 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:24 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:29 msgid "Size:" msgstr "" @@ -1308,7 +1317,7 @@ msgid "Instance Overview" msgstr "" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:11 -#: dashboards/syspanel/instances/tables.py:44 +#: dashboards/syspanel/instances/tables.py:48 msgid "Instance ID" msgstr "" @@ -1325,15 +1334,19 @@ msgstr "" msgid "IP Addresses" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:40 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:50 +msgid "No rules defined." +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:59 msgid "Meta" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:43 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:62 msgid "Key name" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:62 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:81 msgid "No volumes attached." msgstr "" @@ -1352,10 +1365,15 @@ msgid "Update the name of your instance" msgstr "" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_update.html:22 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/update.html:3 #: dashboards/nova/templates/nova/instances_and_volumes/instances/update.html:6 msgid "Update Instance" msgstr "" +#: dashboards/nova/templates/nova/instances_and_volumes/instances/detail.html:3 +msgid "Instance Detail" +msgstr "" + #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_attach.html:9 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/attach.html:6 msgid "Manage Volume Attachments" @@ -1380,6 +1398,34 @@ msgstr "" msgid "Create Volume Snapshot" msgstr "" +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:3 +msgid "Volume Overview" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:6 +msgid "Info" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:9 +msgid "Volume Name:" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:30 +msgid "Created at:" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:40 +msgid "Attached To:" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:43 +msgid "on" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:46 +msgid "Not attached" +msgstr "" + #: dashboards/nova/templates/nova/instances_and_volumes/volumes/create.html:6 msgid "Create a Volume" msgstr "" @@ -1388,36 +1434,12 @@ msgstr "" msgid "Create a Volume Snapshot" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:20 -msgid "Details" +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:3 +msgid "Volume Details" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:22 -msgid "ID:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:23 -msgid "Name:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:26 -msgid "Status:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:27 -msgid "Created:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:29 -msgid "Attached To:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:35 -msgid "on" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:37 -msgid "Not Attached" +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:6 +msgid "Volume Detail" msgstr "" #: dashboards/nova/templates/nova/objects/_copy.html:17 @@ -1582,18 +1604,18 @@ msgstr "" msgid "Unable to retrieve image list." msgstr "" -#: dashboards/syspanel/instances/tables.py:41 +#: dashboards/syspanel/instances/tables.py:45 msgid "Tenant" msgstr "" -#: dashboards/syspanel/instances/tables.py:42 +#: dashboards/syspanel/instances/tables.py:46 #: dashboards/syspanel/projects/tables.py:89 #: dashboards/syspanel/users/tables.py:90 msgid "User" msgstr "" -#: dashboards/syspanel/instances/tables.py:45 -#: dashboards/syspanel/services/tables.py:42 +#: dashboards/syspanel/instances/tables.py:49 +#: dashboards/syspanel/services/tables.py:49 msgid "Host" msgstr "" @@ -1612,7 +1634,7 @@ msgstr "" #: dashboards/syspanel/projects/forms.py:64 #: dashboards/syspanel/projects/forms.py:89 #: dashboards/syspanel/projects/tables.py:75 -#: dashboards/syspanel/services/tables.py:44 +#: dashboards/syspanel/services/tables.py:51 #: dashboards/syspanel/users/tables.py:127 msgid "Enabled" msgstr "" @@ -1627,7 +1649,7 @@ msgid "Unable to create tenant." msgstr "" #: dashboards/syspanel/projects/forms.py:83 -#: dashboards/syspanel/users/forms.py:87 +#: dashboards/syspanel/users/forms.py:105 #: dashboards/syspanel/users/tables.py:121 msgid "ID" msgstr "" @@ -1705,7 +1727,7 @@ msgid "Projects" msgstr "" #: dashboards/syspanel/projects/tables.py:71 -#: dashboards/syspanel/services/tables.py:40 +#: dashboards/syspanel/services/tables.py:47 msgid "Id" msgstr "" @@ -1765,11 +1787,16 @@ msgstr "" msgid "Unable to get quota info: %s" msgstr "" -#: dashboards/syspanel/services/tables.py:41 +#: dashboards/syspanel/services/tables.py:39 +#, python-format +msgid "%(type)s (%(backend)s backend)" +msgstr "" + +#: dashboards/syspanel/services/tables.py:48 msgid "Service" msgstr "" -#: dashboards/syspanel/services/tables.py:49 +#: dashboards/syspanel/services/tables.py:56 #: dashboards/syspanel/templates/syspanel/services/index.html:8 msgid "Services" msgstr "" @@ -1875,64 +1902,75 @@ msgid "" "and default project." msgstr "" -#: dashboards/syspanel/users/forms.py:39 +#: dashboards/syspanel/users/forms.py:41 msgid "Select a project" msgstr "" -#: dashboards/syspanel/users/forms.py:52 dashboards/syspanel/users/forms.py:89 +#: dashboards/syspanel/users/forms.py:58 +msgid "Passwords do not match." +msgstr "" + +#: dashboards/syspanel/users/forms.py:64 +#: dashboards/syspanel/users/forms.py:107 #: dashboards/syspanel/users/tables.py:123 msgid "Email" msgstr "" -#: dashboards/syspanel/users/forms.py:53 dashboards/syspanel/users/forms.py:90 -#: views/auth_forms.py:65 +#: dashboards/syspanel/users/forms.py:66 +#: dashboards/syspanel/users/forms.py:108 views/auth_forms.py:65 msgid "Password" msgstr "" -#: dashboards/syspanel/users/forms.py:56 dashboards/syspanel/users/forms.py:93 +#: dashboards/syspanel/users/forms.py:71 +#: dashboards/syspanel/users/forms.py:112 +msgid "Confirm Password" +msgstr "" + +#: dashboards/syspanel/users/forms.py:74 +#: dashboards/syspanel/users/forms.py:114 msgid "Primary Project" msgstr "" -#: dashboards/syspanel/users/forms.py:68 +#: dashboards/syspanel/users/forms.py:86 #, python-format msgid "User \"%s\" was successfully created." msgstr "" -#: dashboards/syspanel/users/forms.py:79 +#: dashboards/syspanel/users/forms.py:97 msgid "Unable to add user to primary project." msgstr "" -#: dashboards/syspanel/users/forms.py:82 +#: dashboards/syspanel/users/forms.py:100 msgid "Unable to create user." msgstr "" -#: dashboards/syspanel/users/forms.py:88 +#: dashboards/syspanel/users/forms.py:106 #: dashboards/syspanel/users/tables.py:122 views/auth_forms.py:64 msgid "User Name" msgstr "" -#: dashboards/syspanel/users/forms.py:104 +#: dashboards/syspanel/users/forms.py:125 msgid "name" msgstr "" -#: dashboards/syspanel/users/forms.py:104 +#: dashboards/syspanel/users/forms.py:125 msgid "email" msgstr "" -#: dashboards/syspanel/users/forms.py:113 +#: dashboards/syspanel/users/forms.py:134 msgid "primary project" msgstr "" -#: dashboards/syspanel/users/forms.py:124 +#: dashboards/syspanel/users/forms.py:145 msgid "password" msgstr "" -#: dashboards/syspanel/users/forms.py:134 +#: dashboards/syspanel/users/forms.py:155 #, python-format msgid "Updated %(attributes)s for \"%(user)s\"." msgstr "" -#: dashboards/syspanel/users/forms.py:139 +#: dashboards/syspanel/users/forms.py:160 #, python-format msgid "Unable to update %(attributes)s for \"%(user)s\"." msgstr "" @@ -1996,31 +2034,30 @@ msgstr "" msgid "Unable to update user." msgstr "" -#: tables/actions.py:280 +#: tables/actions.py:277 msgid "Update" msgstr "" -#: tables/actions.py:495 -#, python-format -msgid "Unable to %s." -msgstr "" - -#: tables/actions.py:501 +#: tables/actions.py:506 #, python-format msgid "You do not have permission to %(action)s: %(objs)s" msgstr "" -#: tables/actions.py:507 +#: tables/actions.py:512 #, python-format msgid "Unable to %(action)s: %(objs)s" msgstr "" -#: tables/actions.py:513 +#: tables/actions.py:518 #, python-format msgid "%(action)s: %(objs)s" msgstr "" -#: tables/actions.py:524 +#: tables/actions.py:528 +msgid "Delete" +msgstr "" + +#: tables/actions.py:529 msgid "Deleted" msgstr "" @@ -2224,11 +2261,15 @@ msgstr "" msgid "Invalid user name or password." msgstr "" -#: views/auth_forms.py:136 +#: views/auth_forms.py:122 +msgid "An error occurred authenticating. Please try again later." +msgstr "" + +#: views/auth_forms.py:141 #, python-format msgid "No tenants present for user: %(user)s" msgstr "" -#: views/auth_forms.py:160 +#: views/auth_forms.py:165 msgid "You are not authorized for any available tenants." msgstr "" diff --git a/horizon/locale/ja/LC_MESSAGES/django.po b/horizon/locale/ja/LC_MESSAGES/django.po index 92244e5f22..c0985cd9ee 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-10 09:27+0800\n" +"POT-Creation-Date: 2012-03-13 18:36-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Takeshi Nakajima \n" "Language-Team: LANGUAGE \n" @@ -78,8 +78,8 @@ msgstr "" #: 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:131 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:32 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:164 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:42 #, fuzzy msgid "Instance" msgstr "インスタンス" @@ -121,6 +121,7 @@ msgid "Released" msgstr "リリース" #: dashboards/nova/access_and_security/floating_ips/tables.py:46 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:22 msgid "Floating IP" msgstr "" @@ -150,8 +151,8 @@ 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:207 -#: dashboards/syspanel/instances/tables.py:49 +#: dashboards/nova/instances_and_volumes/instances/tables.py:211 +#: dashboards/syspanel/instances/tables.py:53 msgid "IP Address" msgstr "" @@ -170,7 +171,7 @@ msgstr "イメージ%sを更新できません。" msgid "Unable to retrieve instance list." msgstr "%sをリボーク(無効化)できません。" -#: dashboards/nova/access_and_security/floating_ips/views.py:92 +#: dashboards/nova/access_and_security/floating_ips/views.py:100 msgid "No floating IP pools available." msgstr "" @@ -329,7 +330,8 @@ msgstr "セキュリティグループ" #: dashboards/nova/access_and_security/security_groups/tables.py:31 #: dashboards/nova/access_and_security/security_groups/tables.py:65 -#: dashboards/nova/images_and_snapshots/images/forms.py:108 +#: dashboards/nova/images_and_snapshots/images/forms.py:107 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:40 msgid "Security Groups" msgstr "セキュリティグループ" @@ -348,19 +350,20 @@ 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:89 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:117 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:133 #: 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/users/forms.py:51 +#: dashboards/syspanel/users/forms.py:63 msgid "Name" 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:91 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:120 #: 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 @@ -419,7 +422,7 @@ msgid "Slash is not an allowed character." msgstr "" #: dashboards/nova/containers/forms.py:45 -#: dashboards/nova/containers/tables.py:101 +#: dashboards/nova/containers/tables.py:103 #, fuzzy msgid "Container Name" msgstr "ユーザ名" @@ -435,7 +438,7 @@ msgid "Unable to create container." msgstr "キー%sを作成できません。" #: dashboards/nova/containers/forms.py:59 -#: dashboards/nova/containers/tables.py:182 +#: dashboards/nova/containers/tables.py:169 #, fuzzy msgid "Object Name" msgstr "ユーザ名" @@ -472,80 +475,67 @@ msgid "Unable to copy object." msgstr "" #: dashboards/nova/containers/panel.py:28 -#: dashboards/nova/containers/tables.py:112 +#: dashboards/nova/containers/tables.py:37 +#: dashboards/nova/containers/tables.py:114 #: dashboards/nova/templates/nova/containers/index.html:8 msgid "Containers" msgstr "" -#: dashboards/nova/containers/tables.py:37 -#: dashboards/nova/containers/tables.py:119 tables/actions.py:523 -msgid "Delete" -msgstr "削除" - -#: dashboards/nova/containers/tables.py:38 +#: dashboards/nova/containers/tables.py:36 #, fuzzy -msgid "Delete Containers" -msgstr "新規ボリュームを作成する。" +msgid "Container" +msgstr "ユーザ名" -#: dashboards/nova/containers/tables.py:51 +#: dashboards/nova/containers/tables.py:53 #, fuzzy, python-format msgid "Unable to delete non-empty container: %s" msgstr "キー%sを削除できません。" -#: dashboards/nova/containers/tables.py:55 +#: dashboards/nova/containers/tables.py:57 #, fuzzy, python-format msgid "Successfully deleted containers: %s" msgstr "プロジェクト%(proj)sを正常に修正しました。" -#: dashboards/nova/containers/tables.py:62 +#: dashboards/nova/containers/tables.py:64 #: 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:69 +#: dashboards/nova/containers/tables.py:71 msgid "List Objects" msgstr "" -#: dashboards/nova/containers/tables.py:75 +#: dashboards/nova/containers/tables.py:77 #: dashboards/nova/templates/nova/objects/_upload.html:23 msgid "Upload Object" msgstr "" -#: dashboards/nova/containers/tables.py:103 -#: dashboards/nova/containers/tables.py:190 +#: dashboards/nova/containers/tables.py:105 +#: dashboards/nova/containers/tables.py:121 +#: dashboards/nova/containers/tables.py:177 #, fuzzy msgid "Objects" msgstr "ユーザ名" -#: dashboards/nova/containers/tables.py:105 -#: dashboards/nova/containers/tables.py:183 -#: dashboards/nova/instances_and_volumes/instances/tables.py:208 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:92 -#: dashboards/syspanel/instances/tables.py:50 +#: dashboards/nova/containers/tables.py:107 +#: dashboards/nova/containers/tables.py:170 +#: dashboards/nova/instances_and_volumes/instances/tables.py:212 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:121 +#: dashboards/syspanel/instances/tables.py:54 msgid "Size" msgstr "" #: dashboards/nova/containers/tables.py:120 #, fuzzy -msgid "Delete Objects" -msgstr "プロジェクトを削除" +msgid "Object" +msgstr "ユーザ名" -#: dashboards/nova/containers/tables.py:132 -#, fuzzy -msgid "Unable to delete object." -msgstr "ボリューム%sを削除できません。" - -#: dashboards/nova/containers/tables.py:135 -#, fuzzy, python-format -msgid "Successfully deleted objects: %s" -msgstr "プロジェクト%(proj)sを正常に修正しました。" - -#: dashboards/nova/containers/tables.py:143 +#: dashboards/nova/containers/tables.py:131 msgid "Copy" msgstr "" -#: dashboards/nova/containers/tables.py:154 +#: dashboards/nova/containers/tables.py:142 msgid "Download" msgstr "" @@ -644,47 +634,57 @@ msgstr "" msgid "Instance Count" msgstr "インスタンス" -#: dashboards/nova/images_and_snapshots/images/forms.py:106 +#: dashboards/nova/images_and_snapshots/images/forms.py:105 msgid "Number of instances to launch." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:112 +#: dashboards/nova/images_and_snapshots/images/forms.py:111 #, fuzzy msgid "Launch instance in these security groups." msgstr "セキュリティグループ%sを作成できません。" -#: dashboards/nova/images_and_snapshots/images/forms.py:114 +#: dashboards/nova/images_and_snapshots/images/forms.py:113 msgid "Volume or Volume Snapshot" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:116 +#: dashboards/nova/images_and_snapshots/images/forms.py:115 msgid "Volume to boot from." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:117 +#: dashboards/nova/images_and_snapshots/images/forms.py:116 #, fuzzy msgid "Device Name" msgstr "ユーザ名" -#: dashboards/nova/images_and_snapshots/images/forms.py:120 +#: dashboards/nova/images_and_snapshots/images/forms.py:119 msgid "Volume mount point (e.g. 'vda' mounts at '/dev/vda')." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:123 +#: dashboards/nova/images_and_snapshots/images/forms.py:122 #, fuzzy msgid "Delete on Terminate" msgstr "削除" -#: dashboards/nova/images_and_snapshots/images/forms.py:126 +#: dashboards/nova/images_and_snapshots/images/forms.py:125 msgid "Delete volume on instance terminate" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:161 +#: dashboards/nova/images_and_snapshots/images/forms.py:131 +#, fuzzy +msgid "Select a keypair" +msgstr "プロジェクトを削除" + +#: dashboards/nova/images_and_snapshots/images/forms.py:133 +#, fuzzy +msgid "No keypairs available." +msgstr "現在イメージがありません。" + +#: dashboards/nova/images_and_snapshots/images/forms.py:164 #, fuzzy, python-format msgid "Instance \"%s\" launched." msgstr "インスタンス%sが開始しました。" -#: dashboards/nova/images_and_snapshots/images/forms.py:165 +#: dashboards/nova/images_and_snapshots/images/forms.py:168 #, fuzzy, python-format msgid "Unable to launch instance: %(exc)s" msgstr "イメージ%sを更新できません。" @@ -712,18 +712,20 @@ msgid "Edit" msgstr "編集" #: dashboards/nova/images_and_snapshots/images/tables.py:71 -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:44 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:63 #, fuzzy msgid "Image Name" msgstr "ユーザ名" #: dashboards/nova/images_and_snapshots/images/tables.py:76 -#: dashboards/nova/instances_and_volumes/instances/tables.py:210 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:94 +#: dashboards/nova/instances_and_volumes/instances/tables.py:215 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:124 #: 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 -#: dashboards/syspanel/instances/tables.py:52 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:18 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:21 +#: dashboards/syspanel/instances/tables.py:57 msgid "Status" msgstr "ステータス" @@ -732,54 +734,54 @@ msgstr "ステータス" msgid "Public" msgstr "公開する" -#: dashboards/nova/images_and_snapshots/images/views.py:59 -#: dashboards/nova/images_and_snapshots/images/views.py:159 +#: dashboards/nova/images_and_snapshots/images/views.py:57 +#: dashboards/nova/images_and_snapshots/images/views.py:157 #, fuzzy, python-format msgid "Unable to retrieve image \"%s\"." msgstr "%sをリボーク(無効化)できません。" -#: dashboards/nova/images_and_snapshots/images/views.py:88 +#: dashboards/nova/images_and_snapshots/images/views.py:86 #, fuzzy msgid "Unable to retrieve instance flavors." msgstr "%sをリボーク(無効化)できません。" -#: dashboards/nova/images_and_snapshots/images/views.py:98 +#: dashboards/nova/images_and_snapshots/images/views.py:96 #, fuzzy msgid "Unable to retrieve keypairs." msgstr "キー%sを作成できません。" -#: dashboards/nova/images_and_snapshots/images/views.py:107 +#: dashboards/nova/images_and_snapshots/images/views.py:105 #, fuzzy msgid "Unable to retrieve list of security groups" msgstr "キー%sを作成できません。" -#: dashboards/nova/images_and_snapshots/images/views.py:112 +#: dashboards/nova/images_and_snapshots/images/views.py:110 #, fuzzy msgid "Select Volume" msgstr "言語を選択" -#: dashboards/nova/images_and_snapshots/images/views.py:117 +#: 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 msgid "Snapshot" msgstr "スナップショット" -#: dashboards/nova/images_and_snapshots/images/views.py:120 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:34 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:118 -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:55 +#: 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:151 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:74 #, fuzzy msgid "Volume" msgstr "ボリューム" -#: dashboards/nova/images_and_snapshots/images/views.py:134 -#: dashboards/nova/images_and_snapshots/images/views.py:145 +#: dashboards/nova/images_and_snapshots/images/views.py:132 +#: dashboards/nova/images_and_snapshots/images/views.py:143 #, fuzzy msgid "Unable to retrieve list of volumes" msgstr "キー%sを作成できません。" -#: dashboards/nova/images_and_snapshots/images/views.py:183 -#: dashboards/nova/instances_and_volumes/instances/views.py:115 +#: dashboards/nova/images_and_snapshots/images/views.py:182 +#: dashboards/nova/instances_and_volumes/instances/views.py:117 #, fuzzy, python-format msgid "Unable to retrieve details for instance \"%s\"." msgstr "%sをリボーク(無効化)できません。" @@ -831,6 +833,7 @@ msgid "Volume Snapshots" msgstr "スナップショット" #: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:39 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:10 #, fuzzy msgid "Volume ID" msgstr "ボリューム" @@ -874,8 +877,8 @@ msgstr "削除" #: 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:222 -#: dashboards/syspanel/instances/tables.py:64 +#: dashboards/nova/instances_and_volumes/instances/tables.py:229 +#: dashboards/syspanel/instances/tables.py:71 #: dashboards/syspanel/projects/forms.py:115 #: dashboards/syspanel/templates/syspanel/instances/index.html:3 msgid "Instances" @@ -950,26 +953,26 @@ msgstr "" msgid "Not available" msgstr "現在イメージがありません。" -#: dashboards/nova/instances_and_volumes/instances/tables.py:206 +#: dashboards/nova/instances_and_volumes/instances/tables.py:210 #: 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:52 usage/tables.py:45 #, fuzzy msgid "Instance Name" msgstr "インスタンス" -#: dashboards/nova/instances_and_volumes/instances/tables.py:212 -#: dashboards/syspanel/instances/tables.py:54 +#: dashboards/nova/instances_and_volumes/instances/tables.py:219 +#: dashboards/syspanel/instances/tables.py:61 msgid "Task" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:218 -#: dashboards/syspanel/instances/tables.py:60 +#: dashboards/nova/instances_and_volumes/instances/tables.py:225 +#: dashboards/syspanel/instances/tables.py:67 #, fuzzy msgid "Power State" msgstr "状態" #: dashboards/nova/instances_and_volumes/instances/tabs.py:25 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:12 +#: dashboards/nova/instances_and_volumes/volumes/tabs.py:26 #: dashboards/nova/templates/nova/overview/usage.html:6 #: dashboards/syspanel/templates/syspanel/overview/usage.html:6 msgid "Overview" @@ -1031,58 +1034,63 @@ msgstr "ユーザ%sを作成中..." msgid "Error Creating Volume Snapshot: %(exc)s" msgstr "ユーザ%sを作成中..." -#: dashboards/nova/instances_and_volumes/volumes/tables.py:35 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:109 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:119 -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:49 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:36 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:140 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:152 +#: 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:44 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:53 +msgid "Volumes in error states cannot be deleted via the Nova API." +msgstr "" + +#: dashboards/nova/instances_and_volumes/volumes/tables.py:59 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_create.html:23 #, fuzzy msgid "Create Volume" msgstr "作成" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:51 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:66 #, fuzzy msgid "Edit Attachments" msgstr "ボリュームを付与する。" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:60 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:76 #: 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:69 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:91 #: templatetags/sizeformat.py:58 #, python-format msgid "%s GB" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:105 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:136 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:35 #, fuzzy msgid "Attachments" msgstr "ボリュームを付与する。" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:116 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:149 msgid "Detach" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:117 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:150 msgid "Detached" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/views.py:50 -#, fuzzy, python-format -msgid "Error fetching volume: %s" -msgstr "ユーザ%sを作成中..." +#: dashboards/nova/instances_and_volumes/volumes/tabs.py:40 +#, fuzzy +msgid "Unable to retrieve volume details." +msgstr "ボリューム%sを作成できません。" -#: dashboards/nova/instances_and_volumes/volumes/views.py:89 -#: dashboards/nova/instances_and_volumes/volumes/views.py:99 +#: dashboards/nova/instances_and_volumes/volumes/views.py:72 +#: dashboards/nova/instances_and_volumes/volumes/views.py:82 #, fuzzy msgid "Unable to retrieve volume information." msgstr "イメージ%sの登録削除ができませんでした。" @@ -1091,34 +1099,48 @@ msgstr "イメージ%sの登録削除ができませんでした。" msgid "Access & Security" msgstr "" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:7 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:8 #: dashboards/nova/templates/nova/access_and_security/floating_ips/allocate.html:3 #, fuzzy msgid "Allocate Floating IP" msgstr "イメージ%sを更新できません。" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:16 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:17 #: dashboards/nova/templates/nova/access_and_security/floating_ips/_associate.html:16 #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:18 #: dashboards/nova/templates/nova/images_and_snapshots/images/_update.html:16 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html:17 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_update.html:16 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:25 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:12 #: dashboards/settings/templates/settings/ec2/download_form.html:17 #: dashboards/settings/templates/settings/project/_openrc.html:17 #: dashboards/settings/templates/settings/user/_language.html:30 msgid "Description:" msgstr "説明：" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:17 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:18 msgid "Allocate a floating IP from a given floating ip pool." msgstr "" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:22 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:20 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:20 +#, fuzzy +msgid "Project Quotas" +msgstr "クォータ" + +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:23 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:24 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:31 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:38 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:45 +msgid "Available" +msgstr "" + +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:31 msgid "Allocate IP" msgstr "" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:23 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:32 #: dashboards/nova/templates/nova/access_and_security/floating_ips/_associate.html:23 #: dashboards/nova/templates/nova/access_and_security/keypairs/_create.html:24 #: dashboards/nova/templates/nova/access_and_security/keypairs/_import.html:24 @@ -1235,18 +1257,6 @@ msgid "" "resources used by this project in relation to the project's quotas." msgstr "" -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:20 -#, fuzzy -msgid "Project Quotas" -msgstr "クォータ" - -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:24 -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:31 -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:38 -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:45 -msgid "Available" -msgstr "" - #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:30 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:20 #: dashboards/syspanel/flavors/forms.py:38 @@ -1264,7 +1274,7 @@ msgstr "" #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:37 #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:38 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:21 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:24 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:29 msgid "GB" msgstr "" @@ -1334,11 +1344,12 @@ msgstr "イメージを更新" #: dashboards/nova/templates/nova/images_and_snapshots/images/detail.html:24 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:16 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:26 msgid "Specs" msgstr "" #: dashboards/nova/templates/nova/images_and_snapshots/images/detail.html:26 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:24 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:29 msgid "Size:" msgstr "" @@ -1402,7 +1413,7 @@ msgid "Instance Overview" msgstr "インスタンス" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:11 -#: dashboards/syspanel/instances/tables.py:44 +#: dashboards/syspanel/instances/tables.py:48 #, fuzzy msgid "Instance ID" msgstr "インスタンスID:" @@ -1420,16 +1431,20 @@ msgstr "" msgid "IP Addresses" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:40 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:50 +msgid "No rules defined." +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:59 msgid "Meta" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:43 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:62 #, fuzzy msgid "Key name" msgstr "ユーザ名" -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:62 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:81 msgid "No volumes attached." msgstr "" @@ -1449,10 +1464,16 @@ msgid "Update the name of your instance" msgstr "" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_update.html:22 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/update.html:3 #: dashboards/nova/templates/nova/instances_and_volumes/instances/update.html:6 msgid "Update Instance" msgstr "インスタンスを更新" +#: dashboards/nova/templates/nova/instances_and_volumes/instances/detail.html:3 +#, fuzzy +msgid "Instance Detail" +msgstr "インスタンスID:" + #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_attach.html:9 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/attach.html:6 msgid "Manage Volume Attachments" @@ -1480,6 +1501,40 @@ msgstr "" msgid "Create Volume Snapshot" msgstr "新規ボリュームを作成する。" +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:3 +#, fuzzy +msgid "Volume Overview" +msgstr "概要" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:6 +#, fuzzy +msgid "Info" +msgstr "情報" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:9 +#, fuzzy +msgid "Volume Name:" +msgstr "ユーザ名" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:30 +#, fuzzy +msgid "Created at:" +msgstr "作成" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:40 +#, fuzzy +msgid "Attached To:" +msgstr "ボリュームを付与する。" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:43 +msgid "on" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:46 +#, fuzzy +msgid "Not attached" +msgstr "ボリュームを付与する。" + #: dashboards/nova/templates/nova/instances_and_volumes/volumes/create.html:6 #, fuzzy msgid "Create a Volume" @@ -1489,42 +1544,15 @@ msgstr "新規ボリュームを作成する。" msgid "Create a Volume Snapshot" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:20 -msgid "Details" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:22 -msgid "ID:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:23 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:3 #, fuzzy -msgid "Name:" -msgstr "名前" +msgid "Volume Details" +msgstr "ボリューム" -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:26 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:6 #, fuzzy -msgid "Status:" -msgstr "ステータス" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:27 -#, fuzzy -msgid "Created:" -msgstr "作成" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:29 -#, fuzzy -msgid "Attached To:" -msgstr "ボリュームを付与する。" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:35 -msgid "on" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:37 -#, fuzzy -msgid "Not Attached" -msgstr "ボリュームを付与する。" +msgid "Volume Detail" +msgstr "ボリューム" #: dashboards/nova/templates/nova/objects/_copy.html:17 msgid "" @@ -1699,18 +1727,18 @@ msgstr "%sをリボーク(無効化)できません。" msgid "Unable to retrieve image list." msgstr "キー%sを作成できません。" -#: dashboards/syspanel/instances/tables.py:41 +#: dashboards/syspanel/instances/tables.py:45 msgid "Tenant" msgstr "テナント" -#: dashboards/syspanel/instances/tables.py:42 +#: dashboards/syspanel/instances/tables.py:46 #: dashboards/syspanel/projects/tables.py:89 #: dashboards/syspanel/users/tables.py:90 msgid "User" msgstr "" -#: dashboards/syspanel/instances/tables.py:45 -#: dashboards/syspanel/services/tables.py:42 +#: dashboards/syspanel/instances/tables.py:49 +#: dashboards/syspanel/services/tables.py:49 msgid "Host" msgstr "" @@ -1731,7 +1759,7 @@ msgstr "キー%sを作成できません。" #: dashboards/syspanel/projects/forms.py:64 #: dashboards/syspanel/projects/forms.py:89 #: dashboards/syspanel/projects/tables.py:75 -#: dashboards/syspanel/services/tables.py:44 +#: dashboards/syspanel/services/tables.py:51 #: dashboards/syspanel/users/tables.py:127 msgid "Enabled" msgstr "" @@ -1747,7 +1775,7 @@ msgid "Unable to create tenant." msgstr "キー%sを作成できません。" #: dashboards/syspanel/projects/forms.py:83 -#: dashboards/syspanel/users/forms.py:87 +#: dashboards/syspanel/users/forms.py:105 #: dashboards/syspanel/users/tables.py:121 msgid "ID" msgstr "" @@ -1831,7 +1859,7 @@ msgid "Projects" msgstr "プロジェクトを削除" #: dashboards/syspanel/projects/tables.py:71 -#: dashboards/syspanel/services/tables.py:40 +#: dashboards/syspanel/services/tables.py:47 msgid "Id" msgstr "" @@ -1898,11 +1926,16 @@ msgstr "クォータ" msgid "Unable to get quota info: %s" msgstr "イメージ%sを公開できません。" -#: dashboards/syspanel/services/tables.py:41 +#: dashboards/syspanel/services/tables.py:39 +#, python-format +msgid "%(type)s (%(backend)s backend)" +msgstr "" + +#: dashboards/syspanel/services/tables.py:48 msgid "Service" msgstr "" -#: dashboards/syspanel/services/tables.py:49 +#: dashboards/syspanel/services/tables.py:56 #: dashboards/syspanel/templates/syspanel/services/index.html:8 msgid "Services" msgstr "サービス" @@ -2020,70 +2053,82 @@ msgid "" "and default project." msgstr "" -#: dashboards/syspanel/users/forms.py:39 +#: dashboards/syspanel/users/forms.py:41 #, fuzzy msgid "Select a project" msgstr "プロジェクトを削除" -#: dashboards/syspanel/users/forms.py:52 dashboards/syspanel/users/forms.py:89 +#: dashboards/syspanel/users/forms.py:58 +msgid "Passwords do not match." +msgstr "" + +#: dashboards/syspanel/users/forms.py:64 +#: dashboards/syspanel/users/forms.py:107 #: dashboards/syspanel/users/tables.py:123 msgid "Email" msgstr "" -#: dashboards/syspanel/users/forms.py:53 dashboards/syspanel/users/forms.py:90 -#: views/auth_forms.py:65 +#: dashboards/syspanel/users/forms.py:66 +#: dashboards/syspanel/users/forms.py:108 views/auth_forms.py:65 msgid "Password" msgstr "パスワード" -#: dashboards/syspanel/users/forms.py:56 dashboards/syspanel/users/forms.py:93 +#: dashboards/syspanel/users/forms.py:71 +#: dashboards/syspanel/users/forms.py:112 +#, fuzzy +msgid "Confirm Password" +msgstr "パスワード" + +#: dashboards/syspanel/users/forms.py:74 +#: dashboards/syspanel/users/forms.py:114 #, fuzzy msgid "Primary Project" msgstr "テナント" -#: dashboards/syspanel/users/forms.py:68 +#: dashboards/syspanel/users/forms.py:86 #, fuzzy, python-format msgid "User \"%s\" was successfully created." msgstr "キー%sは正常に削除されました。" -#: dashboards/syspanel/users/forms.py:79 +#: dashboards/syspanel/users/forms.py:97 #, fuzzy msgid "Unable to add user to primary project." msgstr "イメージ%sを更新できません。" -#: dashboards/syspanel/users/forms.py:82 +#: dashboards/syspanel/users/forms.py:100 #, fuzzy msgid "Unable to create user." msgstr "ボリューム%sを作成できません。" -#: dashboards/syspanel/users/forms.py:88 +#: dashboards/syspanel/users/forms.py:106 #: dashboards/syspanel/users/tables.py:122 views/auth_forms.py:64 msgid "User Name" msgstr "ユーザ名" -#: dashboards/syspanel/users/forms.py:104 +#: dashboards/syspanel/users/forms.py:125 msgid "name" msgstr "" -#: dashboards/syspanel/users/forms.py:104 +#: dashboards/syspanel/users/forms.py:125 msgid "email" msgstr "" -#: dashboards/syspanel/users/forms.py:113 +#: dashboards/syspanel/users/forms.py:134 #, fuzzy msgid "primary project" msgstr "テナント" -#: dashboards/syspanel/users/forms.py:124 +#: dashboards/syspanel/users/forms.py:145 #, fuzzy msgid "password" msgstr "パスワード" -#: dashboards/syspanel/users/forms.py:134 +#: dashboards/syspanel/users/forms.py:155 #, fuzzy, python-format msgid "Updated %(attributes)s for \"%(user)s\"." msgstr "キー%sを削除できません。" -#: dashboards/syspanel/users/forms.py:139 +#: dashboards/syspanel/users/forms.py:160 #, fuzzy, python-format msgid "Unable to update %(attributes)s for \"%(user)s\"." msgstr "キー%sを削除できません。" @@ -2149,32 +2194,31 @@ msgstr "イメージ%sを公開できません。" msgid "Unable to update user." msgstr "イメージ%sを更新できません。" -#: tables/actions.py:280 +#: tables/actions.py:277 #, fuzzy msgid "Update" msgstr "イメージを更新" -#: tables/actions.py:495 -#, fuzzy, python-format -msgid "Unable to %s." -msgstr "%sを起動できません。" - -#: tables/actions.py:501 +#: tables/actions.py:506 #, python-format msgid "You do not have permission to %(action)s: %(objs)s" msgstr "" -#: tables/actions.py:507 +#: tables/actions.py:512 #, fuzzy, python-format msgid "Unable to %(action)s: %(objs)s" msgstr "キー%sを削除できません。" -#: tables/actions.py:513 +#: tables/actions.py:518 #, python-format msgid "%(action)s: %(objs)s" msgstr "" -#: tables/actions.py:524 +#: tables/actions.py:528 +msgid "Delete" +msgstr "削除" + +#: tables/actions.py:529 #, fuzzy msgid "Deleted" msgstr "削除" @@ -2381,15 +2425,55 @@ msgstr "キー%sを作成できません。" msgid "Invalid user name or password." msgstr "" -#: views/auth_forms.py:136 +#: views/auth_forms.py:122 +msgid "An error occurred authenticating. Please try again later." +msgstr "" + +#: views/auth_forms.py:141 #, python-format msgid "No tenants present for user: %(user)s" msgstr "" -#: views/auth_forms.py:160 +#: views/auth_forms.py:165 msgid "You are not authorized for any available tenants." msgstr "" +#, fuzzy +#~ msgid "Delete Containers" +#~ msgstr "新規ボリュームを作成する。" + +#, fuzzy +#~ msgid "Delete Objects" +#~ msgstr "プロジェクトを削除" + +#, fuzzy +#~ msgid "Unable to delete object." +#~ msgstr "ボリューム%sを削除できません。" + +#, fuzzy +#~ msgid "Successfully deleted objects: %s" +#~ msgstr "プロジェクト%(proj)sを正常に修正しました。" + +#, fuzzy +#~ msgid "Error fetching volume: %s" +#~ msgstr "ユーザ%sを作成中..." + +#, fuzzy +#~ msgid "Name:" +#~ msgstr "名前" + +#, fuzzy +#~ msgid "Status:" +#~ msgstr "ステータス" + +#, fuzzy +#~ msgid "Created:" +#~ msgstr "作成" + +#, fuzzy +#~ msgid "Unable to %s." +#~ msgstr "%sを起動できません。" + #, fuzzy #~ msgid "Network" #~ msgstr "ネットワーク" diff --git a/horizon/locale/pl/LC_MESSAGES/django.po b/horizon/locale/pl/LC_MESSAGES/django.po index f27381afd4..27f1af3d3a 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-10 09:27+0800\n" +"POT-Creation-Date: 2012-03-13 18:36-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" @@ -74,8 +74,8 @@ msgstr "" #: 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:131 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:32 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:164 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:42 msgid "Instance" msgstr "" @@ -113,6 +113,7 @@ msgid "Released" msgstr "" #: dashboards/nova/access_and_security/floating_ips/tables.py:46 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:22 msgid "Floating IP" msgstr "" @@ -141,8 +142,8 @@ 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:207 -#: dashboards/syspanel/instances/tables.py:49 +#: dashboards/nova/instances_and_volumes/instances/tables.py:211 +#: dashboards/syspanel/instances/tables.py:53 msgid "IP Address" msgstr "" @@ -159,7 +160,7 @@ msgstr "" msgid "Unable to retrieve instance list." msgstr "" -#: dashboards/nova/access_and_security/floating_ips/views.py:92 +#: dashboards/nova/access_and_security/floating_ips/views.py:100 msgid "No floating IP pools available." msgstr "" @@ -313,7 +314,8 @@ msgstr "" #: dashboards/nova/access_and_security/security_groups/tables.py:31 #: dashboards/nova/access_and_security/security_groups/tables.py:65 -#: dashboards/nova/images_and_snapshots/images/forms.py:108 +#: dashboards/nova/images_and_snapshots/images/forms.py:107 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:40 msgid "Security Groups" msgstr "" @@ -330,19 +332,20 @@ 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:89 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:117 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:133 #: 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/users/forms.py:51 +#: dashboards/syspanel/users/forms.py:63 msgid "Name" 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:91 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:120 #: 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 @@ -398,7 +401,7 @@ msgid "Slash is not an allowed character." msgstr "" #: dashboards/nova/containers/forms.py:45 -#: dashboards/nova/containers/tables.py:101 +#: dashboards/nova/containers/tables.py:103 msgid "Container Name" msgstr "" @@ -411,7 +414,7 @@ msgid "Unable to create container." msgstr "" #: dashboards/nova/containers/forms.py:59 -#: dashboards/nova/containers/tables.py:182 +#: dashboards/nova/containers/tables.py:169 msgid "Object Name" msgstr "" @@ -445,76 +448,64 @@ msgid "Unable to copy object." msgstr "" #: dashboards/nova/containers/panel.py:28 -#: dashboards/nova/containers/tables.py:112 +#: dashboards/nova/containers/tables.py:37 +#: dashboards/nova/containers/tables.py:114 #: dashboards/nova/templates/nova/containers/index.html:8 msgid "Containers" msgstr "" -#: dashboards/nova/containers/tables.py:37 -#: dashboards/nova/containers/tables.py:119 tables/actions.py:523 -msgid "Delete" +#: dashboards/nova/containers/tables.py:36 +msgid "Container" msgstr "" -#: dashboards/nova/containers/tables.py:38 -msgid "Delete Containers" -msgstr "" - -#: dashboards/nova/containers/tables.py:51 +#: dashboards/nova/containers/tables.py:53 #, python-format msgid "Unable to delete non-empty container: %s" msgstr "" -#: dashboards/nova/containers/tables.py:55 +#: dashboards/nova/containers/tables.py:57 #, python-format msgid "Successfully deleted containers: %s" msgstr "" -#: dashboards/nova/containers/tables.py:62 +#: dashboards/nova/containers/tables.py:64 #: 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:69 +#: dashboards/nova/containers/tables.py:71 msgid "List Objects" msgstr "" -#: dashboards/nova/containers/tables.py:75 +#: dashboards/nova/containers/tables.py:77 #: dashboards/nova/templates/nova/objects/_upload.html:23 msgid "Upload Object" msgstr "" -#: dashboards/nova/containers/tables.py:103 -#: dashboards/nova/containers/tables.py:190 +#: dashboards/nova/containers/tables.py:105 +#: dashboards/nova/containers/tables.py:121 +#: dashboards/nova/containers/tables.py:177 msgid "Objects" msgstr "" -#: dashboards/nova/containers/tables.py:105 -#: dashboards/nova/containers/tables.py:183 -#: dashboards/nova/instances_and_volumes/instances/tables.py:208 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:92 -#: dashboards/syspanel/instances/tables.py:50 +#: dashboards/nova/containers/tables.py:107 +#: dashboards/nova/containers/tables.py:170 +#: dashboards/nova/instances_and_volumes/instances/tables.py:212 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:121 +#: dashboards/syspanel/instances/tables.py:54 msgid "Size" msgstr "" #: dashboards/nova/containers/tables.py:120 -msgid "Delete Objects" +msgid "Object" msgstr "" -#: dashboards/nova/containers/tables.py:132 -msgid "Unable to delete object." -msgstr "" - -#: dashboards/nova/containers/tables.py:135 -#, python-format -msgid "Successfully deleted objects: %s" -msgstr "" - -#: dashboards/nova/containers/tables.py:143 +#: dashboards/nova/containers/tables.py:131 msgid "Copy" msgstr "" -#: dashboards/nova/containers/tables.py:154 +#: dashboards/nova/containers/tables.py:142 msgid "Download" msgstr "" @@ -602,44 +593,52 @@ msgstr "" msgid "Instance Count" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:106 +#: dashboards/nova/images_and_snapshots/images/forms.py:105 msgid "Number of instances to launch." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:112 +#: dashboards/nova/images_and_snapshots/images/forms.py:111 msgid "Launch instance in these security groups." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:114 +#: dashboards/nova/images_and_snapshots/images/forms.py:113 msgid "Volume or Volume Snapshot" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:116 +#: dashboards/nova/images_and_snapshots/images/forms.py:115 msgid "Volume to boot from." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:117 +#: dashboards/nova/images_and_snapshots/images/forms.py:116 msgid "Device Name" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:120 +#: dashboards/nova/images_and_snapshots/images/forms.py:119 msgid "Volume mount point (e.g. 'vda' mounts at '/dev/vda')." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:123 +#: dashboards/nova/images_and_snapshots/images/forms.py:122 msgid "Delete on Terminate" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:126 +#: dashboards/nova/images_and_snapshots/images/forms.py:125 msgid "Delete volume on instance terminate" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:161 +#: dashboards/nova/images_and_snapshots/images/forms.py:131 +msgid "Select a keypair" +msgstr "" + +#: dashboards/nova/images_and_snapshots/images/forms.py:133 +msgid "No keypairs available." +msgstr "" + +#: dashboards/nova/images_and_snapshots/images/forms.py:164 #, python-format msgid "Instance \"%s\" launched." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:165 +#: dashboards/nova/images_and_snapshots/images/forms.py:168 #, python-format msgid "Unable to launch instance: %(exc)s" msgstr "" @@ -665,17 +664,19 @@ msgid "Edit" msgstr "" #: dashboards/nova/images_and_snapshots/images/tables.py:71 -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:44 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:63 msgid "Image Name" msgstr "" #: dashboards/nova/images_and_snapshots/images/tables.py:76 -#: dashboards/nova/instances_and_volumes/instances/tables.py:210 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:94 +#: dashboards/nova/instances_and_volumes/instances/tables.py:215 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:124 #: 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 -#: dashboards/syspanel/instances/tables.py:52 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:18 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:21 +#: dashboards/syspanel/instances/tables.py:57 msgid "Status" msgstr "" @@ -683,48 +684,48 @@ msgstr "" msgid "Public" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:59 -#: dashboards/nova/images_and_snapshots/images/views.py:159 +#: dashboards/nova/images_and_snapshots/images/views.py:57 +#: dashboards/nova/images_and_snapshots/images/views.py:157 #, python-format msgid "Unable to retrieve image \"%s\"." msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:88 +#: dashboards/nova/images_and_snapshots/images/views.py:86 msgid "Unable to retrieve instance flavors." msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:98 +#: dashboards/nova/images_and_snapshots/images/views.py:96 msgid "Unable to retrieve keypairs." msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:107 +#: dashboards/nova/images_and_snapshots/images/views.py:105 msgid "Unable to retrieve list of security groups" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:112 +#: dashboards/nova/images_and_snapshots/images/views.py:110 msgid "Select Volume" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:117 +#: 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 msgid "Snapshot" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:120 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:34 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:118 -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:55 +#: 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:151 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:74 msgid "Volume" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:134 -#: dashboards/nova/images_and_snapshots/images/views.py:145 +#: dashboards/nova/images_and_snapshots/images/views.py:132 +#: dashboards/nova/images_and_snapshots/images/views.py:143 msgid "Unable to retrieve list of volumes" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:183 -#: dashboards/nova/instances_and_volumes/instances/views.py:115 +#: dashboards/nova/images_and_snapshots/images/views.py:182 +#: dashboards/nova/instances_and_volumes/instances/views.py:117 #, python-format msgid "Unable to retrieve details for instance \"%s\"." msgstr "" @@ -770,6 +771,7 @@ msgid "Volume Snapshots" msgstr "" #: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:39 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:10 msgid "Volume ID" msgstr "" @@ -808,8 +810,8 @@ msgstr "" #: 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:222 -#: dashboards/syspanel/instances/tables.py:64 +#: dashboards/nova/instances_and_volumes/instances/tables.py:229 +#: dashboards/syspanel/instances/tables.py:71 #: dashboards/syspanel/projects/forms.py:115 #: dashboards/syspanel/templates/syspanel/instances/index.html:3 msgid "Instances" @@ -882,24 +884,24 @@ msgstr "" msgid "Not available" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:206 +#: dashboards/nova/instances_and_volumes/instances/tables.py:210 #: 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:52 usage/tables.py:45 msgid "Instance Name" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:212 -#: dashboards/syspanel/instances/tables.py:54 +#: dashboards/nova/instances_and_volumes/instances/tables.py:219 +#: dashboards/syspanel/instances/tables.py:61 msgid "Task" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:218 -#: dashboards/syspanel/instances/tables.py:60 +#: dashboards/nova/instances_and_volumes/instances/tables.py:225 +#: dashboards/syspanel/instances/tables.py:67 msgid "Power State" msgstr "" #: dashboards/nova/instances_and_volumes/instances/tabs.py:25 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:12 +#: dashboards/nova/instances_and_volumes/volumes/tabs.py:26 #: dashboards/nova/templates/nova/overview/usage.html:6 #: dashboards/syspanel/templates/syspanel/overview/usage.html:6 msgid "Overview" @@ -960,55 +962,59 @@ msgstr "" msgid "Error Creating Volume Snapshot: %(exc)s" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:35 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:109 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:119 -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:49 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:36 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:140 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:152 +#: 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:44 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:53 +msgid "Volumes in error states cannot be deleted via the Nova API." +msgstr "" + +#: dashboards/nova/instances_and_volumes/volumes/tables.py:59 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_create.html:23 msgid "Create Volume" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:51 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:66 msgid "Edit Attachments" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:60 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:76 #: 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:69 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:91 #: templatetags/sizeformat.py:58 #, python-format msgid "%s GB" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:105 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:136 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:35 msgid "Attachments" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:116 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:149 msgid "Detach" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:117 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:150 msgid "Detached" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/views.py:50 -#, python-format -msgid "Error fetching volume: %s" +#: dashboards/nova/instances_and_volumes/volumes/tabs.py:40 +msgid "Unable to retrieve volume details." msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/views.py:89 -#: dashboards/nova/instances_and_volumes/volumes/views.py:99 +#: dashboards/nova/instances_and_volumes/volumes/views.py:72 +#: dashboards/nova/instances_and_volumes/volumes/views.py:82 msgid "Unable to retrieve volume information." msgstr "" @@ -1016,33 +1022,46 @@ msgstr "" msgid "Access & Security" msgstr "" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:7 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:8 #: dashboards/nova/templates/nova/access_and_security/floating_ips/allocate.html:3 msgid "Allocate Floating IP" msgstr "" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:16 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:17 #: dashboards/nova/templates/nova/access_and_security/floating_ips/_associate.html:16 #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:18 #: dashboards/nova/templates/nova/images_and_snapshots/images/_update.html:16 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html:17 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_update.html:16 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:25 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:12 #: dashboards/settings/templates/settings/ec2/download_form.html:17 #: dashboards/settings/templates/settings/project/_openrc.html:17 #: dashboards/settings/templates/settings/user/_language.html:30 msgid "Description:" msgstr "" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:17 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:18 msgid "Allocate a floating IP from a given floating ip pool." msgstr "" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:22 -msgid "Allocate IP" +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:20 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:20 +msgid "Project Quotas" msgstr "" #: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:23 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:24 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:31 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:38 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:45 +msgid "Available" +msgstr "" + +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:31 +msgid "Allocate IP" +msgstr "" + +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:32 #: dashboards/nova/templates/nova/access_and_security/floating_ips/_associate.html:23 #: dashboards/nova/templates/nova/access_and_security/keypairs/_create.html:24 #: dashboards/nova/templates/nova/access_and_security/keypairs/_import.html:24 @@ -1151,17 +1170,6 @@ msgid "" "resources used by this project in relation to the project's quotas." msgstr "" -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:20 -msgid "Project Quotas" -msgstr "" - -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:24 -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:31 -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:38 -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:45 -msgid "Available" -msgstr "" - #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:30 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:20 #: dashboards/syspanel/flavors/forms.py:38 @@ -1179,7 +1187,7 @@ msgstr "" #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:37 #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:38 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:21 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:24 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:29 msgid "GB" msgstr "" @@ -1242,11 +1250,12 @@ msgstr "" #: dashboards/nova/templates/nova/images_and_snapshots/images/detail.html:24 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:16 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:26 msgid "Specs" msgstr "" #: dashboards/nova/templates/nova/images_and_snapshots/images/detail.html:26 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:24 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:29 msgid "Size:" msgstr "" @@ -1307,7 +1316,7 @@ msgid "Instance Overview" msgstr "" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:11 -#: dashboards/syspanel/instances/tables.py:44 +#: dashboards/syspanel/instances/tables.py:48 msgid "Instance ID" msgstr "" @@ -1324,15 +1333,19 @@ msgstr "" msgid "IP Addresses" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:40 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:50 +msgid "No rules defined." +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:59 msgid "Meta" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:43 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:62 msgid "Key name" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:62 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:81 msgid "No volumes attached." msgstr "" @@ -1351,10 +1364,15 @@ msgid "Update the name of your instance" msgstr "" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_update.html:22 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/update.html:3 #: dashboards/nova/templates/nova/instances_and_volumes/instances/update.html:6 msgid "Update Instance" msgstr "" +#: dashboards/nova/templates/nova/instances_and_volumes/instances/detail.html:3 +msgid "Instance Detail" +msgstr "" + #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_attach.html:9 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/attach.html:6 msgid "Manage Volume Attachments" @@ -1379,6 +1397,34 @@ msgstr "" msgid "Create Volume Snapshot" msgstr "" +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:3 +msgid "Volume Overview" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:6 +msgid "Info" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:9 +msgid "Volume Name:" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:30 +msgid "Created at:" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:40 +msgid "Attached To:" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:43 +msgid "on" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:46 +msgid "Not attached" +msgstr "" + #: dashboards/nova/templates/nova/instances_and_volumes/volumes/create.html:6 msgid "Create a Volume" msgstr "" @@ -1387,36 +1433,12 @@ msgstr "" msgid "Create a Volume Snapshot" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:20 -msgid "Details" +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:3 +msgid "Volume Details" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:22 -msgid "ID:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:23 -msgid "Name:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:26 -msgid "Status:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:27 -msgid "Created:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:29 -msgid "Attached To:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:35 -msgid "on" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:37 -msgid "Not Attached" +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:6 +msgid "Volume Detail" msgstr "" #: dashboards/nova/templates/nova/objects/_copy.html:17 @@ -1581,18 +1603,18 @@ msgstr "" msgid "Unable to retrieve image list." msgstr "" -#: dashboards/syspanel/instances/tables.py:41 +#: dashboards/syspanel/instances/tables.py:45 msgid "Tenant" msgstr "" -#: dashboards/syspanel/instances/tables.py:42 +#: dashboards/syspanel/instances/tables.py:46 #: dashboards/syspanel/projects/tables.py:89 #: dashboards/syspanel/users/tables.py:90 msgid "User" msgstr "" -#: dashboards/syspanel/instances/tables.py:45 -#: dashboards/syspanel/services/tables.py:42 +#: dashboards/syspanel/instances/tables.py:49 +#: dashboards/syspanel/services/tables.py:49 msgid "Host" msgstr "" @@ -1611,7 +1633,7 @@ msgstr "" #: dashboards/syspanel/projects/forms.py:64 #: dashboards/syspanel/projects/forms.py:89 #: dashboards/syspanel/projects/tables.py:75 -#: dashboards/syspanel/services/tables.py:44 +#: dashboards/syspanel/services/tables.py:51 #: dashboards/syspanel/users/tables.py:127 msgid "Enabled" msgstr "" @@ -1626,7 +1648,7 @@ msgid "Unable to create tenant." msgstr "" #: dashboards/syspanel/projects/forms.py:83 -#: dashboards/syspanel/users/forms.py:87 +#: dashboards/syspanel/users/forms.py:105 #: dashboards/syspanel/users/tables.py:121 msgid "ID" msgstr "" @@ -1704,7 +1726,7 @@ msgid "Projects" msgstr "" #: dashboards/syspanel/projects/tables.py:71 -#: dashboards/syspanel/services/tables.py:40 +#: dashboards/syspanel/services/tables.py:47 msgid "Id" msgstr "" @@ -1764,11 +1786,16 @@ msgstr "" msgid "Unable to get quota info: %s" msgstr "" -#: dashboards/syspanel/services/tables.py:41 +#: dashboards/syspanel/services/tables.py:39 +#, python-format +msgid "%(type)s (%(backend)s backend)" +msgstr "" + +#: dashboards/syspanel/services/tables.py:48 msgid "Service" msgstr "" -#: dashboards/syspanel/services/tables.py:49 +#: dashboards/syspanel/services/tables.py:56 #: dashboards/syspanel/templates/syspanel/services/index.html:8 msgid "Services" msgstr "" @@ -1874,64 +1901,75 @@ msgid "" "and default project." msgstr "" -#: dashboards/syspanel/users/forms.py:39 +#: dashboards/syspanel/users/forms.py:41 msgid "Select a project" msgstr "" -#: dashboards/syspanel/users/forms.py:52 dashboards/syspanel/users/forms.py:89 +#: dashboards/syspanel/users/forms.py:58 +msgid "Passwords do not match." +msgstr "" + +#: dashboards/syspanel/users/forms.py:64 +#: dashboards/syspanel/users/forms.py:107 #: dashboards/syspanel/users/tables.py:123 msgid "Email" msgstr "" -#: dashboards/syspanel/users/forms.py:53 dashboards/syspanel/users/forms.py:90 -#: views/auth_forms.py:65 +#: dashboards/syspanel/users/forms.py:66 +#: dashboards/syspanel/users/forms.py:108 views/auth_forms.py:65 msgid "Password" msgstr "" -#: dashboards/syspanel/users/forms.py:56 dashboards/syspanel/users/forms.py:93 +#: dashboards/syspanel/users/forms.py:71 +#: dashboards/syspanel/users/forms.py:112 +msgid "Confirm Password" +msgstr "" + +#: dashboards/syspanel/users/forms.py:74 +#: dashboards/syspanel/users/forms.py:114 msgid "Primary Project" msgstr "" -#: dashboards/syspanel/users/forms.py:68 +#: dashboards/syspanel/users/forms.py:86 #, python-format msgid "User \"%s\" was successfully created." msgstr "" -#: dashboards/syspanel/users/forms.py:79 +#: dashboards/syspanel/users/forms.py:97 msgid "Unable to add user to primary project." msgstr "" -#: dashboards/syspanel/users/forms.py:82 +#: dashboards/syspanel/users/forms.py:100 msgid "Unable to create user." msgstr "" -#: dashboards/syspanel/users/forms.py:88 +#: dashboards/syspanel/users/forms.py:106 #: dashboards/syspanel/users/tables.py:122 views/auth_forms.py:64 msgid "User Name" msgstr "" -#: dashboards/syspanel/users/forms.py:104 +#: dashboards/syspanel/users/forms.py:125 msgid "name" msgstr "" -#: dashboards/syspanel/users/forms.py:104 +#: dashboards/syspanel/users/forms.py:125 msgid "email" msgstr "" -#: dashboards/syspanel/users/forms.py:113 +#: dashboards/syspanel/users/forms.py:134 msgid "primary project" msgstr "" -#: dashboards/syspanel/users/forms.py:124 +#: dashboards/syspanel/users/forms.py:145 msgid "password" msgstr "" -#: dashboards/syspanel/users/forms.py:134 +#: dashboards/syspanel/users/forms.py:155 #, python-format msgid "Updated %(attributes)s for \"%(user)s\"." msgstr "" -#: dashboards/syspanel/users/forms.py:139 +#: dashboards/syspanel/users/forms.py:160 #, python-format msgid "Unable to update %(attributes)s for \"%(user)s\"." msgstr "" @@ -1995,31 +2033,30 @@ msgstr "" msgid "Unable to update user." msgstr "" -#: tables/actions.py:280 +#: tables/actions.py:277 msgid "Update" msgstr "" -#: tables/actions.py:495 -#, python-format -msgid "Unable to %s." -msgstr "" - -#: tables/actions.py:501 +#: tables/actions.py:506 #, python-format msgid "You do not have permission to %(action)s: %(objs)s" msgstr "" -#: tables/actions.py:507 +#: tables/actions.py:512 #, python-format msgid "Unable to %(action)s: %(objs)s" msgstr "" -#: tables/actions.py:513 +#: tables/actions.py:518 #, python-format msgid "%(action)s: %(objs)s" msgstr "" -#: tables/actions.py:524 +#: tables/actions.py:528 +msgid "Delete" +msgstr "" + +#: tables/actions.py:529 msgid "Deleted" msgstr "" @@ -2223,11 +2260,15 @@ msgstr "" msgid "Invalid user name or password." msgstr "" -#: views/auth_forms.py:136 +#: views/auth_forms.py:122 +msgid "An error occurred authenticating. Please try again later." +msgstr "" + +#: views/auth_forms.py:141 #, python-format msgid "No tenants present for user: %(user)s" msgstr "" -#: views/auth_forms.py:160 +#: views/auth_forms.py:165 msgid "You are not authorized for any available tenants." msgstr "" diff --git a/horizon/locale/zh_CN/LC_MESSAGES/django.po b/horizon/locale/zh_CN/LC_MESSAGES/django.po index 9016bee88f..5011572342 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-10 09:27+0800\n" +"POT-Creation-Date: 2012-03-13 18:36-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,8 +74,8 @@ msgstr "" #: 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:131 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:32 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:164 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:42 msgid "Instance" msgstr "" @@ -113,6 +113,7 @@ msgid "Released" msgstr "" #: dashboards/nova/access_and_security/floating_ips/tables.py:46 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:22 msgid "Floating IP" msgstr "" @@ -141,8 +142,8 @@ 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:207 -#: dashboards/syspanel/instances/tables.py:49 +#: dashboards/nova/instances_and_volumes/instances/tables.py:211 +#: dashboards/syspanel/instances/tables.py:53 msgid "IP Address" msgstr "" @@ -159,7 +160,7 @@ msgstr "" msgid "Unable to retrieve instance list." msgstr "" -#: dashboards/nova/access_and_security/floating_ips/views.py:92 +#: dashboards/nova/access_and_security/floating_ips/views.py:100 msgid "No floating IP pools available." msgstr "" @@ -313,7 +314,8 @@ msgstr "" #: dashboards/nova/access_and_security/security_groups/tables.py:31 #: dashboards/nova/access_and_security/security_groups/tables.py:65 -#: dashboards/nova/images_and_snapshots/images/forms.py:108 +#: dashboards/nova/images_and_snapshots/images/forms.py:107 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:40 msgid "Security Groups" msgstr "" @@ -330,19 +332,20 @@ 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:89 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:117 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:133 #: 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/users/forms.py:51 +#: dashboards/syspanel/users/forms.py:63 msgid "Name" 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:91 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:120 #: 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 @@ -398,7 +401,7 @@ msgid "Slash is not an allowed character." msgstr "" #: dashboards/nova/containers/forms.py:45 -#: dashboards/nova/containers/tables.py:101 +#: dashboards/nova/containers/tables.py:103 msgid "Container Name" msgstr "" @@ -411,7 +414,7 @@ msgid "Unable to create container." msgstr "" #: dashboards/nova/containers/forms.py:59 -#: dashboards/nova/containers/tables.py:182 +#: dashboards/nova/containers/tables.py:169 msgid "Object Name" msgstr "" @@ -445,76 +448,64 @@ msgid "Unable to copy object." msgstr "" #: dashboards/nova/containers/panel.py:28 -#: dashboards/nova/containers/tables.py:112 +#: dashboards/nova/containers/tables.py:37 +#: dashboards/nova/containers/tables.py:114 #: dashboards/nova/templates/nova/containers/index.html:8 msgid "Containers" msgstr "" -#: dashboards/nova/containers/tables.py:37 -#: dashboards/nova/containers/tables.py:119 tables/actions.py:523 -msgid "Delete" +#: dashboards/nova/containers/tables.py:36 +msgid "Container" msgstr "" -#: dashboards/nova/containers/tables.py:38 -msgid "Delete Containers" -msgstr "" - -#: dashboards/nova/containers/tables.py:51 +#: dashboards/nova/containers/tables.py:53 #, python-format msgid "Unable to delete non-empty container: %s" msgstr "" -#: dashboards/nova/containers/tables.py:55 +#: dashboards/nova/containers/tables.py:57 #, python-format msgid "Successfully deleted containers: %s" msgstr "" -#: dashboards/nova/containers/tables.py:62 +#: dashboards/nova/containers/tables.py:64 #: 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:69 +#: dashboards/nova/containers/tables.py:71 msgid "List Objects" msgstr "" -#: dashboards/nova/containers/tables.py:75 +#: dashboards/nova/containers/tables.py:77 #: dashboards/nova/templates/nova/objects/_upload.html:23 msgid "Upload Object" msgstr "" -#: dashboards/nova/containers/tables.py:103 -#: dashboards/nova/containers/tables.py:190 +#: dashboards/nova/containers/tables.py:105 +#: dashboards/nova/containers/tables.py:121 +#: dashboards/nova/containers/tables.py:177 msgid "Objects" msgstr "" -#: dashboards/nova/containers/tables.py:105 -#: dashboards/nova/containers/tables.py:183 -#: dashboards/nova/instances_and_volumes/instances/tables.py:208 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:92 -#: dashboards/syspanel/instances/tables.py:50 +#: dashboards/nova/containers/tables.py:107 +#: dashboards/nova/containers/tables.py:170 +#: dashboards/nova/instances_and_volumes/instances/tables.py:212 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:121 +#: dashboards/syspanel/instances/tables.py:54 msgid "Size" msgstr "" #: dashboards/nova/containers/tables.py:120 -msgid "Delete Objects" +msgid "Object" msgstr "" -#: dashboards/nova/containers/tables.py:132 -msgid "Unable to delete object." -msgstr "" - -#: dashboards/nova/containers/tables.py:135 -#, python-format -msgid "Successfully deleted objects: %s" -msgstr "" - -#: dashboards/nova/containers/tables.py:143 +#: dashboards/nova/containers/tables.py:131 msgid "Copy" msgstr "" -#: dashboards/nova/containers/tables.py:154 +#: dashboards/nova/containers/tables.py:142 msgid "Download" msgstr "" @@ -602,44 +593,52 @@ msgstr "" msgid "Instance Count" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:106 +#: dashboards/nova/images_and_snapshots/images/forms.py:105 msgid "Number of instances to launch." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:112 +#: dashboards/nova/images_and_snapshots/images/forms.py:111 msgid "Launch instance in these security groups." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:114 +#: dashboards/nova/images_and_snapshots/images/forms.py:113 msgid "Volume or Volume Snapshot" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:116 +#: dashboards/nova/images_and_snapshots/images/forms.py:115 msgid "Volume to boot from." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:117 +#: dashboards/nova/images_and_snapshots/images/forms.py:116 msgid "Device Name" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:120 +#: dashboards/nova/images_and_snapshots/images/forms.py:119 msgid "Volume mount point (e.g. 'vda' mounts at '/dev/vda')." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:123 +#: dashboards/nova/images_and_snapshots/images/forms.py:122 msgid "Delete on Terminate" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:126 +#: dashboards/nova/images_and_snapshots/images/forms.py:125 msgid "Delete volume on instance terminate" msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:161 +#: dashboards/nova/images_and_snapshots/images/forms.py:131 +msgid "Select a keypair" +msgstr "" + +#: dashboards/nova/images_and_snapshots/images/forms.py:133 +msgid "No keypairs available." +msgstr "" + +#: dashboards/nova/images_and_snapshots/images/forms.py:164 #, python-format msgid "Instance \"%s\" launched." msgstr "" -#: dashboards/nova/images_and_snapshots/images/forms.py:165 +#: dashboards/nova/images_and_snapshots/images/forms.py:168 #, python-format msgid "Unable to launch instance: %(exc)s" msgstr "" @@ -665,17 +664,19 @@ msgid "Edit" msgstr "" #: dashboards/nova/images_and_snapshots/images/tables.py:71 -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:44 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:63 msgid "Image Name" msgstr "" #: dashboards/nova/images_and_snapshots/images/tables.py:76 -#: dashboards/nova/instances_and_volumes/instances/tables.py:210 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:94 +#: dashboards/nova/instances_and_volumes/instances/tables.py:215 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:124 #: 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 -#: dashboards/syspanel/instances/tables.py:52 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:18 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:21 +#: dashboards/syspanel/instances/tables.py:57 msgid "Status" msgstr "" @@ -683,48 +684,48 @@ msgstr "" msgid "Public" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:59 -#: dashboards/nova/images_and_snapshots/images/views.py:159 +#: dashboards/nova/images_and_snapshots/images/views.py:57 +#: dashboards/nova/images_and_snapshots/images/views.py:157 #, python-format msgid "Unable to retrieve image \"%s\"." msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:88 +#: dashboards/nova/images_and_snapshots/images/views.py:86 msgid "Unable to retrieve instance flavors." msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:98 +#: dashboards/nova/images_and_snapshots/images/views.py:96 msgid "Unable to retrieve keypairs." msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:107 +#: dashboards/nova/images_and_snapshots/images/views.py:105 msgid "Unable to retrieve list of security groups" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:112 +#: dashboards/nova/images_and_snapshots/images/views.py:110 msgid "Select Volume" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:117 +#: 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 msgid "Snapshot" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:120 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:34 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:118 -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:55 +#: 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:151 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:74 msgid "Volume" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:134 -#: dashboards/nova/images_and_snapshots/images/views.py:145 +#: dashboards/nova/images_and_snapshots/images/views.py:132 +#: dashboards/nova/images_and_snapshots/images/views.py:143 msgid "Unable to retrieve list of volumes" msgstr "" -#: dashboards/nova/images_and_snapshots/images/views.py:183 -#: dashboards/nova/instances_and_volumes/instances/views.py:115 +#: dashboards/nova/images_and_snapshots/images/views.py:182 +#: dashboards/nova/instances_and_volumes/instances/views.py:117 #, python-format msgid "Unable to retrieve details for instance \"%s\"." msgstr "" @@ -770,6 +771,7 @@ msgid "Volume Snapshots" msgstr "" #: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:39 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:10 msgid "Volume ID" msgstr "" @@ -808,8 +810,8 @@ msgstr "" #: 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:222 -#: dashboards/syspanel/instances/tables.py:64 +#: dashboards/nova/instances_and_volumes/instances/tables.py:229 +#: dashboards/syspanel/instances/tables.py:71 #: dashboards/syspanel/projects/forms.py:115 #: dashboards/syspanel/templates/syspanel/instances/index.html:3 msgid "Instances" @@ -882,24 +884,24 @@ msgstr "" msgid "Not available" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:206 +#: dashboards/nova/instances_and_volumes/instances/tables.py:210 #: 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:52 usage/tables.py:45 msgid "Instance Name" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:212 -#: dashboards/syspanel/instances/tables.py:54 +#: dashboards/nova/instances_and_volumes/instances/tables.py:219 +#: dashboards/syspanel/instances/tables.py:61 msgid "Task" msgstr "" -#: dashboards/nova/instances_and_volumes/instances/tables.py:218 -#: dashboards/syspanel/instances/tables.py:60 +#: dashboards/nova/instances_and_volumes/instances/tables.py:225 +#: dashboards/syspanel/instances/tables.py:67 msgid "Power State" msgstr "" #: dashboards/nova/instances_and_volumes/instances/tabs.py:25 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:12 +#: dashboards/nova/instances_and_volumes/volumes/tabs.py:26 #: dashboards/nova/templates/nova/overview/usage.html:6 #: dashboards/syspanel/templates/syspanel/overview/usage.html:6 msgid "Overview" @@ -960,55 +962,59 @@ msgstr "" msgid "Error Creating Volume Snapshot: %(exc)s" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:35 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:109 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:119 -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:49 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:36 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:140 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:152 +#: 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:44 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:53 +msgid "Volumes in error states cannot be deleted via the Nova API." +msgstr "" + +#: dashboards/nova/instances_and_volumes/volumes/tables.py:59 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_create.html:23 msgid "Create Volume" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:51 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:66 msgid "Edit Attachments" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:60 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:76 #: 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:69 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:91 #: templatetags/sizeformat.py:58 #, python-format msgid "%s GB" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:105 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:136 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:35 msgid "Attachments" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:116 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:149 msgid "Detach" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:117 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:150 msgid "Detached" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/views.py:50 -#, python-format -msgid "Error fetching volume: %s" +#: dashboards/nova/instances_and_volumes/volumes/tabs.py:40 +msgid "Unable to retrieve volume details." msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/views.py:89 -#: dashboards/nova/instances_and_volumes/volumes/views.py:99 +#: dashboards/nova/instances_and_volumes/volumes/views.py:72 +#: dashboards/nova/instances_and_volumes/volumes/views.py:82 msgid "Unable to retrieve volume information." msgstr "" @@ -1016,33 +1022,46 @@ msgstr "" msgid "Access & Security" msgstr "" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:7 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:8 #: dashboards/nova/templates/nova/access_and_security/floating_ips/allocate.html:3 msgid "Allocate Floating IP" msgstr "" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:16 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:17 #: dashboards/nova/templates/nova/access_and_security/floating_ips/_associate.html:16 #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:18 #: dashboards/nova/templates/nova/images_and_snapshots/images/_update.html:16 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html:17 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_update.html:16 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:25 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:12 #: dashboards/settings/templates/settings/ec2/download_form.html:17 #: dashboards/settings/templates/settings/project/_openrc.html:17 #: dashboards/settings/templates/settings/user/_language.html:30 msgid "Description:" msgstr "" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:17 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:18 msgid "Allocate a floating IP from a given floating ip pool." msgstr "" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:22 -msgid "Allocate IP" +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:20 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:20 +msgid "Project Quotas" msgstr "" #: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:23 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:24 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:31 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:38 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:45 +msgid "Available" +msgstr "" + +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:31 +msgid "Allocate IP" +msgstr "" + +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:32 #: dashboards/nova/templates/nova/access_and_security/floating_ips/_associate.html:23 #: dashboards/nova/templates/nova/access_and_security/keypairs/_create.html:24 #: dashboards/nova/templates/nova/access_and_security/keypairs/_import.html:24 @@ -1151,17 +1170,6 @@ msgid "" "resources used by this project in relation to the project's quotas." msgstr "" -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:20 -msgid "Project Quotas" -msgstr "" - -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:24 -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:31 -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:38 -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:45 -msgid "Available" -msgstr "" - #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:30 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:20 #: dashboards/syspanel/flavors/forms.py:38 @@ -1179,7 +1187,7 @@ msgstr "" #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:37 #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:38 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:21 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:24 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:29 msgid "GB" msgstr "" @@ -1242,11 +1250,12 @@ msgstr "" #: dashboards/nova/templates/nova/images_and_snapshots/images/detail.html:24 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:16 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:26 msgid "Specs" msgstr "" #: dashboards/nova/templates/nova/images_and_snapshots/images/detail.html:26 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:24 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:29 msgid "Size:" msgstr "" @@ -1307,7 +1316,7 @@ msgid "Instance Overview" msgstr "" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:11 -#: dashboards/syspanel/instances/tables.py:44 +#: dashboards/syspanel/instances/tables.py:48 msgid "Instance ID" msgstr "" @@ -1324,15 +1333,19 @@ msgstr "" msgid "IP Addresses" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:40 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:50 +msgid "No rules defined." +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:59 msgid "Meta" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:43 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:62 msgid "Key name" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:62 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:81 msgid "No volumes attached." msgstr "" @@ -1351,10 +1364,15 @@ msgid "Update the name of your instance" msgstr "" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_update.html:22 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/update.html:3 #: dashboards/nova/templates/nova/instances_and_volumes/instances/update.html:6 msgid "Update Instance" msgstr "" +#: dashboards/nova/templates/nova/instances_and_volumes/instances/detail.html:3 +msgid "Instance Detail" +msgstr "" + #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_attach.html:9 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/attach.html:6 msgid "Manage Volume Attachments" @@ -1379,6 +1397,34 @@ msgstr "" msgid "Create Volume Snapshot" msgstr "" +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:3 +msgid "Volume Overview" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:6 +msgid "Info" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:9 +msgid "Volume Name:" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:30 +msgid "Created at:" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:40 +msgid "Attached To:" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:43 +msgid "on" +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:46 +msgid "Not attached" +msgstr "" + #: dashboards/nova/templates/nova/instances_and_volumes/volumes/create.html:6 msgid "Create a Volume" msgstr "" @@ -1387,36 +1433,12 @@ msgstr "" msgid "Create a Volume Snapshot" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:20 -msgid "Details" +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:3 +msgid "Volume Details" msgstr "" -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:22 -msgid "ID:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:23 -msgid "Name:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:26 -msgid "Status:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:27 -msgid "Created:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:29 -msgid "Attached To:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:35 -msgid "on" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:37 -msgid "Not Attached" +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:6 +msgid "Volume Detail" msgstr "" #: dashboards/nova/templates/nova/objects/_copy.html:17 @@ -1581,18 +1603,18 @@ msgstr "" msgid "Unable to retrieve image list." msgstr "" -#: dashboards/syspanel/instances/tables.py:41 +#: dashboards/syspanel/instances/tables.py:45 msgid "Tenant" msgstr "" -#: dashboards/syspanel/instances/tables.py:42 +#: dashboards/syspanel/instances/tables.py:46 #: dashboards/syspanel/projects/tables.py:89 #: dashboards/syspanel/users/tables.py:90 msgid "User" msgstr "" -#: dashboards/syspanel/instances/tables.py:45 -#: dashboards/syspanel/services/tables.py:42 +#: dashboards/syspanel/instances/tables.py:49 +#: dashboards/syspanel/services/tables.py:49 msgid "Host" msgstr "" @@ -1611,7 +1633,7 @@ msgstr "" #: dashboards/syspanel/projects/forms.py:64 #: dashboards/syspanel/projects/forms.py:89 #: dashboards/syspanel/projects/tables.py:75 -#: dashboards/syspanel/services/tables.py:44 +#: dashboards/syspanel/services/tables.py:51 #: dashboards/syspanel/users/tables.py:127 msgid "Enabled" msgstr "" @@ -1626,7 +1648,7 @@ msgid "Unable to create tenant." msgstr "" #: dashboards/syspanel/projects/forms.py:83 -#: dashboards/syspanel/users/forms.py:87 +#: dashboards/syspanel/users/forms.py:105 #: dashboards/syspanel/users/tables.py:121 msgid "ID" msgstr "" @@ -1704,7 +1726,7 @@ msgid "Projects" msgstr "" #: dashboards/syspanel/projects/tables.py:71 -#: dashboards/syspanel/services/tables.py:40 +#: dashboards/syspanel/services/tables.py:47 msgid "Id" msgstr "" @@ -1764,11 +1786,16 @@ msgstr "" msgid "Unable to get quota info: %s" msgstr "" -#: dashboards/syspanel/services/tables.py:41 +#: dashboards/syspanel/services/tables.py:39 +#, python-format +msgid "%(type)s (%(backend)s backend)" +msgstr "" + +#: dashboards/syspanel/services/tables.py:48 msgid "Service" msgstr "" -#: dashboards/syspanel/services/tables.py:49 +#: dashboards/syspanel/services/tables.py:56 #: dashboards/syspanel/templates/syspanel/services/index.html:8 msgid "Services" msgstr "" @@ -1874,64 +1901,75 @@ msgid "" "and default project." msgstr "" -#: dashboards/syspanel/users/forms.py:39 +#: dashboards/syspanel/users/forms.py:41 msgid "Select a project" msgstr "" -#: dashboards/syspanel/users/forms.py:52 dashboards/syspanel/users/forms.py:89 +#: dashboards/syspanel/users/forms.py:58 +msgid "Passwords do not match." +msgstr "" + +#: dashboards/syspanel/users/forms.py:64 +#: dashboards/syspanel/users/forms.py:107 #: dashboards/syspanel/users/tables.py:123 msgid "Email" msgstr "" -#: dashboards/syspanel/users/forms.py:53 dashboards/syspanel/users/forms.py:90 -#: views/auth_forms.py:65 +#: dashboards/syspanel/users/forms.py:66 +#: dashboards/syspanel/users/forms.py:108 views/auth_forms.py:65 msgid "Password" msgstr "" -#: dashboards/syspanel/users/forms.py:56 dashboards/syspanel/users/forms.py:93 +#: dashboards/syspanel/users/forms.py:71 +#: dashboards/syspanel/users/forms.py:112 +msgid "Confirm Password" +msgstr "" + +#: dashboards/syspanel/users/forms.py:74 +#: dashboards/syspanel/users/forms.py:114 msgid "Primary Project" msgstr "" -#: dashboards/syspanel/users/forms.py:68 +#: dashboards/syspanel/users/forms.py:86 #, python-format msgid "User \"%s\" was successfully created." msgstr "" -#: dashboards/syspanel/users/forms.py:79 +#: dashboards/syspanel/users/forms.py:97 msgid "Unable to add user to primary project." msgstr "" -#: dashboards/syspanel/users/forms.py:82 +#: dashboards/syspanel/users/forms.py:100 msgid "Unable to create user." msgstr "" -#: dashboards/syspanel/users/forms.py:88 +#: dashboards/syspanel/users/forms.py:106 #: dashboards/syspanel/users/tables.py:122 views/auth_forms.py:64 msgid "User Name" msgstr "" -#: dashboards/syspanel/users/forms.py:104 +#: dashboards/syspanel/users/forms.py:125 msgid "name" msgstr "" -#: dashboards/syspanel/users/forms.py:104 +#: dashboards/syspanel/users/forms.py:125 msgid "email" msgstr "" -#: dashboards/syspanel/users/forms.py:113 +#: dashboards/syspanel/users/forms.py:134 msgid "primary project" msgstr "" -#: dashboards/syspanel/users/forms.py:124 +#: dashboards/syspanel/users/forms.py:145 msgid "password" msgstr "" -#: dashboards/syspanel/users/forms.py:134 +#: dashboards/syspanel/users/forms.py:155 #, python-format msgid "Updated %(attributes)s for \"%(user)s\"." msgstr "" -#: dashboards/syspanel/users/forms.py:139 +#: dashboards/syspanel/users/forms.py:160 #, python-format msgid "Unable to update %(attributes)s for \"%(user)s\"." msgstr "" @@ -1995,31 +2033,30 @@ msgstr "" msgid "Unable to update user." msgstr "" -#: tables/actions.py:280 +#: tables/actions.py:277 msgid "Update" msgstr "" -#: tables/actions.py:495 -#, python-format -msgid "Unable to %s." -msgstr "" - -#: tables/actions.py:501 +#: tables/actions.py:506 #, python-format msgid "You do not have permission to %(action)s: %(objs)s" msgstr "" -#: tables/actions.py:507 +#: tables/actions.py:512 #, python-format msgid "Unable to %(action)s: %(objs)s" msgstr "" -#: tables/actions.py:513 +#: tables/actions.py:518 #, python-format msgid "%(action)s: %(objs)s" msgstr "" -#: tables/actions.py:524 +#: tables/actions.py:528 +msgid "Delete" +msgstr "" + +#: tables/actions.py:529 msgid "Deleted" msgstr "" @@ -2223,11 +2260,15 @@ msgstr "" msgid "Invalid user name or password." msgstr "" -#: views/auth_forms.py:136 +#: views/auth_forms.py:122 +msgid "An error occurred authenticating. Please try again later." +msgstr "" + +#: views/auth_forms.py:141 #, python-format msgid "No tenants present for user: %(user)s" msgstr "" -#: views/auth_forms.py:160 +#: views/auth_forms.py:165 msgid "You are not authorized for any available tenants." msgstr "" diff --git a/horizon/locale/zh_TW/LC_MESSAGES/django.po b/horizon/locale/zh_TW/LC_MESSAGES/django.po index 2cdd41152c..f621018e1e 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-10 09:27+0800\n" +"POT-Creation-Date: 2012-03-13 18:36-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Andy Chong \n" "Language-Team: LANGUAGE \n" @@ -74,8 +74,8 @@ msgstr "浮動IP 取得錯誤： %s" #: 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:131 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:32 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:164 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:42 msgid "Instance" msgstr "執行個體" @@ -113,6 +113,7 @@ msgid "Released" msgstr "已釋放" #: dashboards/nova/access_and_security/floating_ips/tables.py:46 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:22 msgid "Floating IP" msgstr "浮動IP" @@ -141,8 +142,8 @@ 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:207 -#: dashboards/syspanel/instances/tables.py:49 +#: dashboards/nova/instances_and_volumes/instances/tables.py:211 +#: dashboards/syspanel/instances/tables.py:53 msgid "IP Address" msgstr "IP位址" @@ -159,7 +160,7 @@ msgstr "無法配給浮動IP" msgid "Unable to retrieve instance list." msgstr "無法取得執行個體列表" -#: dashboards/nova/access_and_security/floating_ips/views.py:92 +#: dashboards/nova/access_and_security/floating_ips/views.py:100 msgid "No floating IP pools available." msgstr "沒有任何存在的浮動IP集" @@ -317,7 +318,8 @@ msgstr "安全性群組" #: dashboards/nova/access_and_security/security_groups/tables.py:31 #: dashboards/nova/access_and_security/security_groups/tables.py:65 -#: dashboards/nova/images_and_snapshots/images/forms.py:108 +#: dashboards/nova/images_and_snapshots/images/forms.py:107 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:40 msgid "Security Groups" msgstr "安全性群組" @@ -334,19 +336,20 @@ 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:89 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:117 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:133 #: 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/users/forms.py:51 +#: dashboards/syspanel/users/forms.py:63 msgid "Name" 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:91 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:120 #: 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 @@ -402,7 +405,7 @@ msgid "Slash is not an allowed character." msgstr "斜線符號不能被接受" #: dashboards/nova/containers/forms.py:45 -#: dashboards/nova/containers/tables.py:101 +#: dashboards/nova/containers/tables.py:103 msgid "Container Name" msgstr "容器名稱" @@ -415,7 +418,7 @@ msgid "Unable to create container." msgstr "無法建立容器" #: dashboards/nova/containers/forms.py:59 -#: dashboards/nova/containers/tables.py:182 +#: dashboards/nova/containers/tables.py:169 msgid "Object Name" msgstr "物件名稱" @@ -449,76 +452,66 @@ msgid "Unable to copy object." msgstr "無法複製物件" #: dashboards/nova/containers/panel.py:28 -#: dashboards/nova/containers/tables.py:112 +#: dashboards/nova/containers/tables.py:37 +#: dashboards/nova/containers/tables.py:114 #: dashboards/nova/templates/nova/containers/index.html:8 msgid "Containers" msgstr "容器" -#: dashboards/nova/containers/tables.py:37 -#: dashboards/nova/containers/tables.py:119 tables/actions.py:523 -msgid "Delete" -msgstr "刪除" +#: dashboards/nova/containers/tables.py:36 +#, fuzzy +msgid "Container" +msgstr "容器" -#: dashboards/nova/containers/tables.py:38 -msgid "Delete Containers" -msgstr "刪除容器" - -#: dashboards/nova/containers/tables.py:51 +#: dashboards/nova/containers/tables.py:53 #, python-format msgid "Unable to delete non-empty container: %s" msgstr "無法刪除還沒清空的容器： %s" -#: dashboards/nova/containers/tables.py:55 +#: dashboards/nova/containers/tables.py:57 #, python-format msgid "Successfully deleted containers: %s" msgstr "已成功刪除容器： %s" -#: dashboards/nova/containers/tables.py:62 +#: dashboards/nova/containers/tables.py:64 #: 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:69 +#: dashboards/nova/containers/tables.py:71 msgid "List Objects" msgstr "列出物件" -#: dashboards/nova/containers/tables.py:75 +#: dashboards/nova/containers/tables.py:77 #: dashboards/nova/templates/nova/objects/_upload.html:23 msgid "Upload Object" msgstr "上傳物件" -#: dashboards/nova/containers/tables.py:103 -#: dashboards/nova/containers/tables.py:190 +#: dashboards/nova/containers/tables.py:105 +#: dashboards/nova/containers/tables.py:121 +#: dashboards/nova/containers/tables.py:177 msgid "Objects" msgstr "物件" -#: dashboards/nova/containers/tables.py:105 -#: dashboards/nova/containers/tables.py:183 -#: dashboards/nova/instances_and_volumes/instances/tables.py:208 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:92 -#: dashboards/syspanel/instances/tables.py:50 +#: dashboards/nova/containers/tables.py:107 +#: dashboards/nova/containers/tables.py:170 +#: dashboards/nova/instances_and_volumes/instances/tables.py:212 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:121 +#: dashboards/syspanel/instances/tables.py:54 msgid "Size" msgstr "大小" #: dashboards/nova/containers/tables.py:120 -msgid "Delete Objects" -msgstr "刪除物件" +#, fuzzy +msgid "Object" +msgstr "物件" -#: dashboards/nova/containers/tables.py:132 -msgid "Unable to delete object." -msgstr "無法刪除物件" - -#: dashboards/nova/containers/tables.py:135 -#, python-format -msgid "Successfully deleted objects: %s" -msgstr "已成功刪除物件： %s" - -#: dashboards/nova/containers/tables.py:143 +#: dashboards/nova/containers/tables.py:131 msgid "Copy" msgstr "複製" -#: dashboards/nova/containers/tables.py:154 +#: dashboards/nova/containers/tables.py:142 msgid "Download" msgstr "下載" @@ -606,44 +599,54 @@ msgstr "認證用的金鑰選擇" msgid "Instance Count" msgstr "執行個體數量" -#: dashboards/nova/images_and_snapshots/images/forms.py:106 +#: dashboards/nova/images_and_snapshots/images/forms.py:105 msgid "Number of instances to launch." msgstr "要啟動的執行個體數量" -#: dashboards/nova/images_and_snapshots/images/forms.py:112 +#: dashboards/nova/images_and_snapshots/images/forms.py:111 msgid "Launch instance in these security groups." msgstr "在這些安全性群組中啟動執行個體" -#: dashboards/nova/images_and_snapshots/images/forms.py:114 +#: dashboards/nova/images_and_snapshots/images/forms.py:113 msgid "Volume or Volume Snapshot" msgstr "容量或容量快照" -#: dashboards/nova/images_and_snapshots/images/forms.py:116 +#: dashboards/nova/images_and_snapshots/images/forms.py:115 msgid "Volume to boot from." msgstr "開機啟動的容量" -#: dashboards/nova/images_and_snapshots/images/forms.py:117 +#: dashboards/nova/images_and_snapshots/images/forms.py:116 msgid "Device Name" msgstr "裝置名稱" -#: dashboards/nova/images_and_snapshots/images/forms.py:120 +#: dashboards/nova/images_and_snapshots/images/forms.py:119 msgid "Volume mount point (e.g. 'vda' mounts at '/dev/vda')." msgstr "容量掛載點 （例如： ‘vda’掛載在‘/dev/vda’）" -#: dashboards/nova/images_and_snapshots/images/forms.py:123 +#: dashboards/nova/images_and_snapshots/images/forms.py:122 msgid "Delete on Terminate" msgstr "終止執行時刪除" -#: dashboards/nova/images_and_snapshots/images/forms.py:126 +#: dashboards/nova/images_and_snapshots/images/forms.py:125 msgid "Delete volume on instance terminate" msgstr "執行個體終止執行時刪除容量" -#: dashboards/nova/images_and_snapshots/images/forms.py:161 +#: dashboards/nova/images_and_snapshots/images/forms.py:131 +#, fuzzy +msgid "Select a keypair" +msgstr "選擇專案" + +#: dashboards/nova/images_and_snapshots/images/forms.py:133 +#, fuzzy +msgid "No keypairs available." +msgstr "不存在" + +#: dashboards/nova/images_and_snapshots/images/forms.py:164 #, python-format msgid "Instance \"%s\" launched." msgstr "執行個體\"%s\"已啟動" -#: dashboards/nova/images_and_snapshots/images/forms.py:165 +#: dashboards/nova/images_and_snapshots/images/forms.py:168 #, python-format msgid "Unable to launch instance: %(exc)s" msgstr "無法啟動執行個體： %(exc)s" @@ -669,17 +672,19 @@ msgid "Edit" msgstr "編輯" #: dashboards/nova/images_and_snapshots/images/tables.py:71 -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:44 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:63 msgid "Image Name" msgstr "映像名稱" #: dashboards/nova/images_and_snapshots/images/tables.py:76 -#: dashboards/nova/instances_and_volumes/instances/tables.py:210 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:94 +#: dashboards/nova/instances_and_volumes/instances/tables.py:215 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:124 #: 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 -#: dashboards/syspanel/instances/tables.py:52 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:18 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:21 +#: dashboards/syspanel/instances/tables.py:57 msgid "Status" msgstr "狀態" @@ -687,48 +692,48 @@ msgstr "狀態" msgid "Public" msgstr "公開" -#: dashboards/nova/images_and_snapshots/images/views.py:59 -#: dashboards/nova/images_and_snapshots/images/views.py:159 +#: dashboards/nova/images_and_snapshots/images/views.py:57 +#: dashboards/nova/images_and_snapshots/images/views.py:157 #, python-format msgid "Unable to retrieve image \"%s\"." msgstr "無法取得映像\"%s\"。" -#: dashboards/nova/images_and_snapshots/images/views.py:88 +#: dashboards/nova/images_and_snapshots/images/views.py:86 msgid "Unable to retrieve instance flavors." msgstr "無法取得執行個體規格。" -#: dashboards/nova/images_and_snapshots/images/views.py:98 +#: dashboards/nova/images_and_snapshots/images/views.py:96 msgid "Unable to retrieve keypairs." msgstr "無法取得金鑰。" -#: dashboards/nova/images_and_snapshots/images/views.py:107 +#: dashboards/nova/images_and_snapshots/images/views.py:105 msgid "Unable to retrieve list of security groups" msgstr "無法取得安全性群組列表。" -#: dashboards/nova/images_and_snapshots/images/views.py:112 +#: dashboards/nova/images_and_snapshots/images/views.py:110 msgid "Select Volume" msgstr "選擇容量" -#: dashboards/nova/images_and_snapshots/images/views.py:117 +#: 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 msgid "Snapshot" msgstr "快照" -#: dashboards/nova/images_and_snapshots/images/views.py:120 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:34 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:118 -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:55 +#: 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:151 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:74 msgid "Volume" msgstr "容量" -#: dashboards/nova/images_and_snapshots/images/views.py:134 -#: dashboards/nova/images_and_snapshots/images/views.py:145 +#: dashboards/nova/images_and_snapshots/images/views.py:132 +#: dashboards/nova/images_and_snapshots/images/views.py:143 msgid "Unable to retrieve list of volumes" msgstr "無法取得容量列表" -#: dashboards/nova/images_and_snapshots/images/views.py:183 -#: dashboards/nova/instances_and_volumes/instances/views.py:115 +#: dashboards/nova/images_and_snapshots/images/views.py:182 +#: dashboards/nova/instances_and_volumes/instances/views.py:117 #, python-format msgid "Unable to retrieve details for instance \"%s\"." msgstr "無法取得執行個體\"%s\"詳細資料。" @@ -774,6 +779,7 @@ msgid "Volume Snapshots" msgstr "容量快照" #: dashboards/nova/images_and_snapshots/volume_snapshots/tables.py:39 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:10 msgid "Volume ID" msgstr "容量ID" @@ -812,8 +818,8 @@ msgstr "已終止執行" #: 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:222 -#: dashboards/syspanel/instances/tables.py:64 +#: dashboards/nova/instances_and_volumes/instances/tables.py:229 +#: dashboards/syspanel/instances/tables.py:71 #: dashboards/syspanel/projects/forms.py:115 #: dashboards/syspanel/templates/syspanel/instances/index.html:3 msgid "Instances" @@ -886,24 +892,24 @@ msgstr "%(RAM)s 記憶體 | %(VCPU)s 虛擬處理器 | %(disk)s 磁碟" msgid "Not available" msgstr "不存在" -#: dashboards/nova/instances_and_volumes/instances/tables.py:206 +#: dashboards/nova/instances_and_volumes/instances/tables.py:210 #: 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:52 usage/tables.py:45 msgid "Instance Name" msgstr "執行個體名稱" -#: dashboards/nova/instances_and_volumes/instances/tables.py:212 -#: dashboards/syspanel/instances/tables.py:54 +#: dashboards/nova/instances_and_volumes/instances/tables.py:219 +#: dashboards/syspanel/instances/tables.py:61 msgid "Task" msgstr "工作" -#: dashboards/nova/instances_and_volumes/instances/tables.py:218 -#: dashboards/syspanel/instances/tables.py:60 +#: dashboards/nova/instances_and_volumes/instances/tables.py:225 +#: dashboards/syspanel/instances/tables.py:67 msgid "Power State" msgstr "電源狀態" #: dashboards/nova/instances_and_volumes/instances/tabs.py:25 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:12 +#: dashboards/nova/instances_and_volumes/volumes/tabs.py:26 #: dashboards/nova/templates/nova/overview/usage.html:6 #: dashboards/syspanel/templates/syspanel/overview/usage.html:6 msgid "Overview" @@ -964,55 +970,60 @@ msgstr "建立容量快照\"%s\"" msgid "Error Creating Volume Snapshot: %(exc)s" msgstr "建立容量快照錯誤： %(exc)s" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:35 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:109 -#: dashboards/nova/instances_and_volumes/volumes/tables.py:119 -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:49 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:36 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:140 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:152 +#: 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:44 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:53 +msgid "Volumes in error states cannot be deleted via the Nova API." +msgstr "" + +#: dashboards/nova/instances_and_volumes/volumes/tables.py:59 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_create.html:23 msgid "Create Volume" msgstr "建立容量" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:51 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:66 msgid "Edit Attachments" msgstr "編輯掛載" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:60 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:76 #: 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:69 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:91 #: templatetags/sizeformat.py:58 #, python-format msgid "%s GB" msgstr "" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:105 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:136 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:35 msgid "Attachments" msgstr "掛載" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:116 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:149 msgid "Detach" msgstr "卸載" -#: dashboards/nova/instances_and_volumes/volumes/tables.py:117 +#: dashboards/nova/instances_and_volumes/volumes/tables.py:150 msgid "Detached" msgstr "已卸載" -#: dashboards/nova/instances_and_volumes/volumes/views.py:50 -#, python-format -msgid "Error fetching volume: %s" -msgstr "取得容量錯誤： %s" +#: dashboards/nova/instances_and_volumes/volumes/tabs.py:40 +#, fuzzy +msgid "Unable to retrieve volume details." +msgstr "無法取得空間快照" -#: dashboards/nova/instances_and_volumes/volumes/views.py:89 -#: dashboards/nova/instances_and_volumes/volumes/views.py:99 +#: dashboards/nova/instances_and_volumes/volumes/views.py:72 +#: dashboards/nova/instances_and_volumes/volumes/views.py:82 msgid "Unable to retrieve volume information." msgstr "無法取得容量資訊" @@ -1020,33 +1031,46 @@ msgstr "無法取得容量資訊" msgid "Access & Security" msgstr "存取 & 安全性" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:7 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:8 #: dashboards/nova/templates/nova/access_and_security/floating_ips/allocate.html:3 msgid "Allocate Floating IP" msgstr "分配浮動IP" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:16 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:17 #: dashboards/nova/templates/nova/access_and_security/floating_ips/_associate.html:16 #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:18 #: dashboards/nova/templates/nova/images_and_snapshots/images/_update.html:16 #: dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html:17 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_update.html:16 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:25 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:12 #: dashboards/settings/templates/settings/ec2/download_form.html:17 #: dashboards/settings/templates/settings/project/_openrc.html:17 #: dashboards/settings/templates/settings/user/_language.html:30 msgid "Description:" msgstr "詳述：" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:17 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:18 msgid "Allocate a floating IP from a given floating ip pool." msgstr "從浮動IP集分配一個浮動IP" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:22 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:20 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:20 +msgid "Project Quotas" +msgstr "專案配額" + +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:23 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:24 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:31 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:38 +#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:45 +msgid "Available" +msgstr "可用" + +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:31 msgid "Allocate IP" msgstr "分配IP" -#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:23 +#: dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html:32 #: dashboards/nova/templates/nova/access_and_security/floating_ips/_associate.html:23 #: dashboards/nova/templates/nova/access_and_security/keypairs/_create.html:24 #: dashboards/nova/templates/nova/access_and_security/keypairs/_import.html:24 @@ -1163,17 +1187,6 @@ msgstr "" "啟動執行個體所指定的詳細資料。以下圖表顯示的是這個專案配額可以使用以及已使用" "的資源" -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:20 -msgid "Project Quotas" -msgstr "專案配額" - -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:24 -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:31 -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:38 -#: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:45 -msgid "Available" -msgstr "可用" - #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:30 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:20 #: dashboards/syspanel/flavors/forms.py:38 @@ -1191,7 +1204,7 @@ msgstr "磁碟" #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:37 #: dashboards/nova/templates/nova/images_and_snapshots/images/_launch.html:38 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:21 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:24 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:29 msgid "GB" msgstr "" @@ -1254,11 +1267,12 @@ msgstr "最後更新時間：" #: dashboards/nova/templates/nova/images_and_snapshots/images/detail.html:24 #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:16 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:26 msgid "Specs" msgstr "規格" #: dashboards/nova/templates/nova/images_and_snapshots/images/detail.html:26 -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:24 +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:29 msgid "Size:" msgstr "大小" @@ -1319,7 +1333,7 @@ msgid "Instance Overview" msgstr "執行個體大綱" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:11 -#: dashboards/syspanel/instances/tables.py:44 +#: dashboards/syspanel/instances/tables.py:48 msgid "Instance ID" msgstr "執行個體ID" @@ -1336,15 +1350,19 @@ msgstr "虛擬處理器" msgid "IP Addresses" msgstr "IP位址" -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:40 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:50 +msgid "No rules defined." +msgstr "" + +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:59 msgid "Meta" msgstr "相關資料" -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:43 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:62 msgid "Key name" msgstr "金鑰名稱" -#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:62 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html:81 msgid "No volumes attached." msgstr "沒有掛載的容量" @@ -1363,10 +1381,16 @@ msgid "Update the name of your instance" msgstr "更新執行個體的名稱" #: dashboards/nova/templates/nova/instances_and_volumes/instances/_update.html:22 +#: dashboards/nova/templates/nova/instances_and_volumes/instances/update.html:3 #: dashboards/nova/templates/nova/instances_and_volumes/instances/update.html:6 msgid "Update Instance" msgstr "更新執行個體" +#: dashboards/nova/templates/nova/instances_and_volumes/instances/detail.html:3 +#, fuzzy +msgid "Instance Detail" +msgstr "執行個體ID" + #: dashboards/nova/templates/nova/instances_and_volumes/volumes/_attach.html:9 #: dashboards/nova/templates/nova/instances_and_volumes/volumes/attach.html:6 msgid "Manage Volume Attachments" @@ -1391,6 +1415,39 @@ msgstr "容量是可以掛載到執行個體的分塊磁碟裝置" msgid "Create Volume Snapshot" msgstr "建立容量快照" +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:3 +#, fuzzy +msgid "Volume Overview" +msgstr "大綱" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:6 +#, fuzzy +msgid "Info" +msgstr "資訊： " + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:9 +#, fuzzy +msgid "Volume Name:" +msgstr "映像名稱：" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:30 +#, fuzzy +msgid "Created at:" +msgstr "建立時間：" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:40 +msgid "Attached To:" +msgstr "掛載到：" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:43 +msgid "on" +msgstr "在" + +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html:46 +#, fuzzy +msgid "Not attached" +msgstr "沒有掛載" + #: dashboards/nova/templates/nova/instances_and_volumes/volumes/create.html:6 msgid "Create a Volume" msgstr "建立容量" @@ -1399,37 +1456,15 @@ msgstr "建立容量" msgid "Create a Volume Snapshot" msgstr "建立容量快照" -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:20 -msgid "Details" -msgstr "詳細資料" +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:3 +#, fuzzy +msgid "Volume Details" +msgstr "容量ID" -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:22 -msgid "ID:" -msgstr "" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:23 -msgid "Name:" -msgstr "名稱：" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:26 -msgid "Status:" -msgstr "狀態：" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:27 -msgid "Created:" -msgstr "建立於：" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:29 -msgid "Attached To:" -msgstr "掛載到：" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:35 -msgid "on" -msgstr "在" - -#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:37 -msgid "Not Attached" -msgstr "沒有掛載" +#: dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html:6 +#, fuzzy +msgid "Volume Detail" +msgstr "容量ID" #: dashboards/nova/templates/nova/objects/_copy.html:17 msgid "" @@ -1599,18 +1634,18 @@ msgstr "無法取得規格列表： %s" msgid "Unable to retrieve image list." msgstr "無法取得映像列表" -#: dashboards/syspanel/instances/tables.py:41 +#: dashboards/syspanel/instances/tables.py:45 msgid "Tenant" msgstr "租戶" -#: dashboards/syspanel/instances/tables.py:42 +#: dashboards/syspanel/instances/tables.py:46 #: dashboards/syspanel/projects/tables.py:89 #: dashboards/syspanel/users/tables.py:90 msgid "User" msgstr "使用者" -#: dashboards/syspanel/instances/tables.py:45 -#: dashboards/syspanel/services/tables.py:42 +#: dashboards/syspanel/instances/tables.py:49 +#: dashboards/syspanel/services/tables.py:49 msgid "Host" msgstr "主機" @@ -1629,7 +1664,7 @@ msgstr "無法將使用者加入租戶" #: dashboards/syspanel/projects/forms.py:64 #: dashboards/syspanel/projects/forms.py:89 #: dashboards/syspanel/projects/tables.py:75 -#: dashboards/syspanel/services/tables.py:44 +#: dashboards/syspanel/services/tables.py:51 #: dashboards/syspanel/users/tables.py:127 msgid "Enabled" msgstr "已啟用" @@ -1644,7 +1679,7 @@ msgid "Unable to create tenant." msgstr "無法建立租戶" #: dashboards/syspanel/projects/forms.py:83 -#: dashboards/syspanel/users/forms.py:87 +#: dashboards/syspanel/users/forms.py:105 #: dashboards/syspanel/users/tables.py:121 msgid "ID" msgstr "ID" @@ -1722,7 +1757,7 @@ msgid "Projects" msgstr "專案" #: dashboards/syspanel/projects/tables.py:71 -#: dashboards/syspanel/services/tables.py:40 +#: dashboards/syspanel/services/tables.py:47 msgid "Id" msgstr "Id" @@ -1782,11 +1817,16 @@ msgstr "配額" msgid "Unable to get quota info: %s" msgstr "無法取得配額資料： %s" -#: dashboards/syspanel/services/tables.py:41 +#: dashboards/syspanel/services/tables.py:39 +#, python-format +msgid "%(type)s (%(backend)s backend)" +msgstr "" + +#: dashboards/syspanel/services/tables.py:48 msgid "Service" msgstr "服務" -#: dashboards/syspanel/services/tables.py:49 +#: dashboards/syspanel/services/tables.py:56 #: dashboards/syspanel/templates/syspanel/services/index.html:8 msgid "Services" msgstr "服務" @@ -1892,64 +1932,76 @@ msgid "" "and default project." msgstr "您可以在這裡編輯使用者的名稱，電子郵件，密碼和預設專案。" -#: dashboards/syspanel/users/forms.py:39 +#: dashboards/syspanel/users/forms.py:41 msgid "Select a project" msgstr "選擇專案" -#: dashboards/syspanel/users/forms.py:52 dashboards/syspanel/users/forms.py:89 +#: dashboards/syspanel/users/forms.py:58 +msgid "Passwords do not match." +msgstr "" + +#: dashboards/syspanel/users/forms.py:64 +#: dashboards/syspanel/users/forms.py:107 #: dashboards/syspanel/users/tables.py:123 msgid "Email" msgstr "電子郵件" -#: dashboards/syspanel/users/forms.py:53 dashboards/syspanel/users/forms.py:90 -#: views/auth_forms.py:65 +#: dashboards/syspanel/users/forms.py:66 +#: dashboards/syspanel/users/forms.py:108 views/auth_forms.py:65 msgid "Password" msgstr "密碼" -#: dashboards/syspanel/users/forms.py:56 dashboards/syspanel/users/forms.py:93 +#: dashboards/syspanel/users/forms.py:71 +#: dashboards/syspanel/users/forms.py:112 +#, fuzzy +msgid "Confirm Password" +msgstr "密碼" + +#: dashboards/syspanel/users/forms.py:74 +#: dashboards/syspanel/users/forms.py:114 msgid "Primary Project" msgstr "主要專案" -#: dashboards/syspanel/users/forms.py:68 +#: dashboards/syspanel/users/forms.py:86 #, python-format msgid "User \"%s\" was successfully created." msgstr "使用者\"%s\"已被成功建立。" -#: dashboards/syspanel/users/forms.py:79 +#: dashboards/syspanel/users/forms.py:97 msgid "Unable to add user to primary project." msgstr "無法將使用者加入主要專案。" -#: dashboards/syspanel/users/forms.py:82 +#: dashboards/syspanel/users/forms.py:100 msgid "Unable to create user." msgstr "無法建立使用者。" -#: dashboards/syspanel/users/forms.py:88 +#: dashboards/syspanel/users/forms.py:106 #: dashboards/syspanel/users/tables.py:122 views/auth_forms.py:64 msgid "User Name" msgstr "使用者名稱" -#: dashboards/syspanel/users/forms.py:104 +#: dashboards/syspanel/users/forms.py:125 msgid "name" msgstr "名稱" -#: dashboards/syspanel/users/forms.py:104 +#: dashboards/syspanel/users/forms.py:125 msgid "email" msgstr "電子郵件" -#: dashboards/syspanel/users/forms.py:113 +#: dashboards/syspanel/users/forms.py:134 msgid "primary project" msgstr "主要專案" -#: dashboards/syspanel/users/forms.py:124 +#: dashboards/syspanel/users/forms.py:145 msgid "password" msgstr "密碼" -#: dashboards/syspanel/users/forms.py:134 +#: dashboards/syspanel/users/forms.py:155 #, python-format msgid "Updated %(attributes)s for \"%(user)s\"." msgstr "已更新\"%(user)s\"的%(attributes)s。" -#: dashboards/syspanel/users/forms.py:139 +#: dashboards/syspanel/users/forms.py:160 #, python-format msgid "Unable to update %(attributes)s for \"%(user)s\"." msgstr "無法更新\"%(user)s\"的%(attributes)s。" @@ -2013,31 +2065,30 @@ msgstr "無法取得使用者資訊： %s" msgid "Unable to update user." msgstr "無法更新使用者。" -#: tables/actions.py:280 +#: tables/actions.py:277 msgid "Update" msgstr "更新" -#: tables/actions.py:495 -#, python-format -msgid "Unable to %s." -msgstr "無法%s。" - -#: tables/actions.py:501 +#: tables/actions.py:506 #, python-format msgid "You do not have permission to %(action)s: %(objs)s" msgstr "您沒有權限使用%(action)s: %(objs)s" -#: tables/actions.py:507 +#: tables/actions.py:512 #, python-format msgid "Unable to %(action)s: %(objs)s" msgstr "無法%(action)s: %(objs)s" -#: tables/actions.py:513 +#: tables/actions.py:518 #, python-format msgid "%(action)s: %(objs)s" msgstr "" -#: tables/actions.py:524 +#: tables/actions.py:528 +msgid "Delete" +msgstr "刪除" + +#: tables/actions.py:529 msgid "Deleted" msgstr "已刪除" @@ -2241,15 +2292,49 @@ msgstr "無法認證租戶" msgid "Invalid user name or password." msgstr "不合法的使用者名稱或密碼" -#: views/auth_forms.py:136 +#: views/auth_forms.py:122 +msgid "An error occurred authenticating. Please try again later." +msgstr "" + +#: views/auth_forms.py:141 #, python-format msgid "No tenants present for user: %(user)s" msgstr "這使用者沒有租戶： %(user)s" -#: views/auth_forms.py:160 +#: views/auth_forms.py:165 msgid "You are not authorized for any available tenants." msgstr "您沒有任何租戶的權限。" +#~ msgid "Delete Containers" +#~ msgstr "刪除容器" + +#~ msgid "Delete Objects" +#~ msgstr "刪除物件" + +#~ msgid "Unable to delete object." +#~ msgstr "無法刪除物件" + +#~ msgid "Successfully deleted objects: %s" +#~ msgstr "已成功刪除物件： %s" + +#~ msgid "Error fetching volume: %s" +#~ msgstr "取得容量錯誤： %s" + +#~ msgid "Details" +#~ msgstr "詳細資料" + +#~ msgid "Name:" +#~ msgstr "名稱：" + +#~ msgid "Status:" +#~ msgstr "狀態：" + +#~ msgid "Created:" +#~ msgstr "建立於：" + +#~ msgid "Unable to %s." +#~ msgstr "無法%s。" + #~ msgid "enabled" #~ msgstr "已啟用" diff --git a/horizon/tabs/base.py b/horizon/tabs/base.py index 5d7be93f58..9da913a5cf 100644 --- a/horizon/tabs/base.py +++ b/horizon/tabs/base.py @@ -14,6 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. +import sys + from django.template import TemplateSyntaxError from django.template.loader import render_to_string from django.utils.datastructures import SortedDict @@ -261,8 +263,9 @@ class Tab(html.HTMLElement): return '' try: context = self.get_context_data(self.request) - except Exception as exc: - raise TemplateSyntaxError(exc) + except: + exc_type, exc_value, exc_traceback = sys.exc_info() + raise TemplateSyntaxError, exc_value, exc_traceback return render_to_string(self.get_template_name(self.request), context) def get_id(self): diff --git a/horizon/tabs/views.py b/horizon/tabs/views.py index dfe81bce08..ca80467e7f 100644 --- a/horizon/tabs/views.py +++ b/horizon/tabs/views.py @@ -20,8 +20,8 @@ class TabView(generic.TemplateView): def __init__(self): if not self.tab_group_class: - raise AttributeError("You must set the tab_group attribute on %s." - % self.__class__.__name__) + raise AttributeError("You must set the tab_group_class attribute " + "on %s." % self.__class__.__name__) def get_tabs(self, request, *args, **kwargs): return self.tab_group_class(request, **kwargs) diff --git a/openstack_dashboard/locale/es/LC_MESSAGES/django.po b/openstack_dashboard/locale/es/LC_MESSAGES/django.po index e5def2b603..6c8d92b39a 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-05 09:42-0800\n" +"POT-Creation-Date: 2012-03-13 18:37-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 7f682197ee..d181a4c41b 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-05 09:41-0800\n" +"POT-Creation-Date: 2012-03-13 18:37-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 585c79c8a0..adfbecc3be 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-05 09:41-0800\n" +"POT-Creation-Date: 2012-03-13 18:37-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 ec6efa74c9..0c649ea945 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-05 09:42-0800\n" +"POT-Creation-Date: 2012-03-13 18:37-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 e5def2b603..6c8d92b39a 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-05 09:42-0800\n" +"POT-Creation-Date: 2012-03-13 18:37-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 cff7ac9394..33f2d2f566 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-05 11:40-0800\n" +"POT-Creation-Date: 2012-03-13 18:37-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 c5a460d8fd..810ab3658c 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-05 11:40-0800\n" +"POT-Creation-Date: 2012-03-13 18:37-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"