diff --git a/horizon/locale/en/LC_MESSAGES/django.po b/horizon/locale/en/LC_MESSAGES/django.po index 3e2eee779..27202fb67 100644 --- a/horizon/locale/en/LC_MESSAGES/django.po +++ b/horizon/locale/en/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-05-23 11:08-0700\n" +"POT-Creation-Date: 2012-05-29 11:46-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -463,7 +463,7 @@ msgid "Slash is not an allowed character." msgstr "" #: dashboards/nova/containers/forms.py:45 -#: dashboards/nova/containers/tables.py:89 +#: dashboards/nova/containers/tables.py:88 msgid "Container Name" msgstr "" @@ -476,7 +476,7 @@ msgid "Unable to create container." msgstr "" #: dashboards/nova/containers/forms.py:59 -#: dashboards/nova/containers/tables.py:156 +#: dashboards/nova/containers/tables.py:155 msgid "Object Name" msgstr "" @@ -510,46 +510,46 @@ msgid "Unable to copy object." msgstr "" #: dashboards/nova/containers/panel.py:28 -#: dashboards/nova/containers/tables.py:36 -#: dashboards/nova/containers/tables.py:100 +#: dashboards/nova/containers/tables.py:35 +#: dashboards/nova/containers/tables.py:99 #: dashboards/nova/templates/nova/containers/index.html:8 msgid "Containers" msgstr "" -#: dashboards/nova/containers/tables.py:35 +#: dashboards/nova/containers/tables.py:34 msgid "Container" msgstr "" -#: dashboards/nova/containers/tables.py:43 +#: dashboards/nova/containers/tables.py:42 msgid "Containers must be empty before deletion." msgstr "" -#: dashboards/nova/containers/tables.py:49 +#: dashboards/nova/containers/tables.py:48 #: dashboards/nova/templates/nova/containers/_create.html:7 #: 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:56 +#: dashboards/nova/containers/tables.py:55 msgid "List Objects" msgstr "" -#: dashboards/nova/containers/tables.py:63 +#: dashboards/nova/containers/tables.py:62 #: dashboards/nova/templates/nova/objects/_upload.html:23 #: dashboards/nova/templates/nova/objects/upload.html:3 msgid "Upload Object" msgstr "" -#: dashboards/nova/containers/tables.py:91 -#: dashboards/nova/containers/tables.py:107 -#: dashboards/nova/containers/tables.py:164 +#: dashboards/nova/containers/tables.py:90 +#: dashboards/nova/containers/tables.py:106 +#: dashboards/nova/containers/tables.py:163 #: dashboards/nova/templates/nova/objects/index.html:3 msgid "Objects" msgstr "" -#: dashboards/nova/containers/tables.py:93 -#: dashboards/nova/containers/tables.py:157 +#: dashboards/nova/containers/tables.py:92 +#: dashboards/nova/containers/tables.py:156 #: dashboards/nova/instances_and_volumes/instances/tables.py:243 #: dashboards/nova/instances_and_volumes/volumes/tables.py:114 #: dashboards/nova/templates/nova/images_and_snapshots/images/_detail_overview.html:30 @@ -558,15 +558,15 @@ msgstr "" msgid "Size" msgstr "" -#: dashboards/nova/containers/tables.py:106 +#: dashboards/nova/containers/tables.py:105 msgid "Object" msgstr "" -#: dashboards/nova/containers/tables.py:117 +#: dashboards/nova/containers/tables.py:116 msgid "Copy" msgstr "" -#: dashboards/nova/containers/tables.py:128 +#: dashboards/nova/containers/tables.py:127 msgid "Download" msgstr "" @@ -590,15 +590,15 @@ msgstr "" msgid "Images & Snapshots" msgstr "" -#: dashboards/nova/images_and_snapshots/views.py:53 +#: dashboards/nova/images_and_snapshots/views.py:60 msgid "Unable to retrieve images." msgstr "" -#: dashboards/nova/images_and_snapshots/views.py:61 +#: dashboards/nova/images_and_snapshots/views.py:71 msgid "Unable to retrieve snapshots." msgstr "" -#: dashboards/nova/images_and_snapshots/views.py:69 +#: dashboards/nova/images_and_snapshots/views.py:79 msgid "Unable to retrieve volume snapshots." msgstr "" @@ -843,7 +843,6 @@ msgstr "" #: dashboards/nova/instances_and_volumes/instances/tables.py:144 #: dashboards/nova/instances_and_volumes/instances/workflows.py:376 -#: dashboards/nova/templates/nova/images_and_snapshots/images/launch.html:13 #: dashboards/nova/templates/nova/instances_and_volumes/instances/launch.html:3 #: dashboards/nova/templates/nova/instances_and_volumes/instances/launch.html:6 msgid "Launch Instance" @@ -906,7 +905,7 @@ msgstr "" msgid "Unable to retrieve instance details." msgstr "" -#: dashboards/nova/instances_and_volumes/instances/views.py:128 +#: dashboards/nova/instances_and_volumes/instances/views.py:130 #, python-format msgid "Unable to retrieve details for instance \"%s\"." msgstr "" @@ -1027,7 +1026,6 @@ msgid "Select Image" msgstr "" #: dashboards/nova/instances_and_volumes/instances/workflows.py:242 -#: dashboards/nova/instances_and_volumes/instances/workflows.py:253 msgid "No images available." msgstr "" @@ -1035,6 +1033,10 @@ msgstr "" msgid "Select Instance Snapshot" msgstr "" +#: dashboards/nova/instances_and_volumes/instances/workflows.py:253 +msgid "No snapshots available." +msgstr "" + #: dashboards/nova/instances_and_volumes/instances/workflows.py:264 msgid "Unable to retrieve instance flavors." msgstr "" @@ -1781,7 +1783,7 @@ msgstr "" msgid "Unable to get flavor list: %s" msgstr "" -#: dashboards/syspanel/images/views.py:45 +#: dashboards/syspanel/images/views.py:52 msgid "Unable to retrieve image list." msgstr "" @@ -2203,20 +2205,20 @@ msgstr "" msgid "The attribute %(attr)s doesn't exist on %(obj)s." msgstr "" -#: tables/base.py:671 +#: tables/base.py:679 msgid "Actions" msgstr "" -#: tables/base.py:816 +#: tables/base.py:824 msgid "No items to display." msgstr "" -#: tables/base.py:833 +#: tables/base.py:841 #, python-format msgid "No match returned for the id \"%s\"." msgstr "" -#: tables/base.py:940 +#: tables/base.py:948 msgid "Please select a row before taking that action." msgstr "" diff --git a/horizon/locale/es/LC_MESSAGES/django.po b/horizon/locale/es/LC_MESSAGES/django.po index 5cd12cf9c..b971e7684 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-05-23 11:08-0700\n" +"POT-Creation-Date: 2012-05-29 11:46-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -464,7 +464,7 @@ msgid "Slash is not an allowed character." msgstr "" #: dashboards/nova/containers/forms.py:45 -#: dashboards/nova/containers/tables.py:89 +#: dashboards/nova/containers/tables.py:88 msgid "Container Name" msgstr "" @@ -477,7 +477,7 @@ msgid "Unable to create container." msgstr "" #: dashboards/nova/containers/forms.py:59 -#: dashboards/nova/containers/tables.py:156 +#: dashboards/nova/containers/tables.py:155 msgid "Object Name" msgstr "" @@ -511,46 +511,46 @@ msgid "Unable to copy object." msgstr "" #: dashboards/nova/containers/panel.py:28 -#: dashboards/nova/containers/tables.py:36 -#: dashboards/nova/containers/tables.py:100 +#: dashboards/nova/containers/tables.py:35 +#: dashboards/nova/containers/tables.py:99 #: dashboards/nova/templates/nova/containers/index.html:8 msgid "Containers" msgstr "" -#: dashboards/nova/containers/tables.py:35 +#: dashboards/nova/containers/tables.py:34 msgid "Container" msgstr "" -#: dashboards/nova/containers/tables.py:43 +#: dashboards/nova/containers/tables.py:42 msgid "Containers must be empty before deletion." msgstr "" -#: dashboards/nova/containers/tables.py:49 +#: dashboards/nova/containers/tables.py:48 #: dashboards/nova/templates/nova/containers/_create.html:7 #: 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:56 +#: dashboards/nova/containers/tables.py:55 msgid "List Objects" msgstr "" -#: dashboards/nova/containers/tables.py:63 +#: dashboards/nova/containers/tables.py:62 #: dashboards/nova/templates/nova/objects/_upload.html:23 #: dashboards/nova/templates/nova/objects/upload.html:3 msgid "Upload Object" msgstr "" -#: dashboards/nova/containers/tables.py:91 -#: dashboards/nova/containers/tables.py:107 -#: dashboards/nova/containers/tables.py:164 +#: dashboards/nova/containers/tables.py:90 +#: dashboards/nova/containers/tables.py:106 +#: dashboards/nova/containers/tables.py:163 #: dashboards/nova/templates/nova/objects/index.html:3 msgid "Objects" msgstr "" -#: dashboards/nova/containers/tables.py:93 -#: dashboards/nova/containers/tables.py:157 +#: dashboards/nova/containers/tables.py:92 +#: dashboards/nova/containers/tables.py:156 #: dashboards/nova/instances_and_volumes/instances/tables.py:243 #: dashboards/nova/instances_and_volumes/volumes/tables.py:114 #: dashboards/nova/templates/nova/images_and_snapshots/images/_detail_overview.html:30 @@ -559,15 +559,15 @@ msgstr "" msgid "Size" msgstr "" -#: dashboards/nova/containers/tables.py:106 +#: dashboards/nova/containers/tables.py:105 msgid "Object" msgstr "" -#: dashboards/nova/containers/tables.py:117 +#: dashboards/nova/containers/tables.py:116 msgid "Copy" msgstr "" -#: dashboards/nova/containers/tables.py:128 +#: dashboards/nova/containers/tables.py:127 msgid "Download" msgstr "" @@ -591,15 +591,15 @@ msgstr "" msgid "Images & Snapshots" msgstr "" -#: dashboards/nova/images_and_snapshots/views.py:53 +#: dashboards/nova/images_and_snapshots/views.py:60 msgid "Unable to retrieve images." msgstr "" -#: dashboards/nova/images_and_snapshots/views.py:61 +#: dashboards/nova/images_and_snapshots/views.py:71 msgid "Unable to retrieve snapshots." msgstr "" -#: dashboards/nova/images_and_snapshots/views.py:69 +#: dashboards/nova/images_and_snapshots/views.py:79 msgid "Unable to retrieve volume snapshots." msgstr "" @@ -844,7 +844,6 @@ msgstr "" #: dashboards/nova/instances_and_volumes/instances/tables.py:144 #: dashboards/nova/instances_and_volumes/instances/workflows.py:376 -#: dashboards/nova/templates/nova/images_and_snapshots/images/launch.html:13 #: dashboards/nova/templates/nova/instances_and_volumes/instances/launch.html:3 #: dashboards/nova/templates/nova/instances_and_volumes/instances/launch.html:6 msgid "Launch Instance" @@ -907,7 +906,7 @@ msgstr "" msgid "Unable to retrieve instance details." msgstr "" -#: dashboards/nova/instances_and_volumes/instances/views.py:128 +#: dashboards/nova/instances_and_volumes/instances/views.py:130 #, python-format msgid "Unable to retrieve details for instance \"%s\"." msgstr "" @@ -1028,7 +1027,6 @@ msgid "Select Image" msgstr "" #: dashboards/nova/instances_and_volumes/instances/workflows.py:242 -#: dashboards/nova/instances_and_volumes/instances/workflows.py:253 msgid "No images available." msgstr "" @@ -1036,6 +1034,10 @@ msgstr "" msgid "Select Instance Snapshot" msgstr "" +#: dashboards/nova/instances_and_volumes/instances/workflows.py:253 +msgid "No snapshots available." +msgstr "" + #: dashboards/nova/instances_and_volumes/instances/workflows.py:264 msgid "Unable to retrieve instance flavors." msgstr "" @@ -1782,7 +1784,7 @@ msgstr "" msgid "Unable to get flavor list: %s" msgstr "" -#: dashboards/syspanel/images/views.py:45 +#: dashboards/syspanel/images/views.py:52 msgid "Unable to retrieve image list." msgstr "" @@ -2204,20 +2206,20 @@ msgstr "" msgid "The attribute %(attr)s doesn't exist on %(obj)s." msgstr "" -#: tables/base.py:671 +#: tables/base.py:679 msgid "Actions" msgstr "" -#: tables/base.py:816 +#: tables/base.py:824 msgid "No items to display." msgstr "" -#: tables/base.py:833 +#: tables/base.py:841 #, python-format msgid "No match returned for the id \"%s\"." msgstr "" -#: tables/base.py:940 +#: tables/base.py:948 msgid "Please select a row before taking that action." msgstr "" diff --git a/horizon/locale/fr/LC_MESSAGES/django.po b/horizon/locale/fr/LC_MESSAGES/django.po index f8eefbb9e..5c94cada0 100644 --- a/horizon/locale/fr/LC_MESSAGES/django.po +++ b/horizon/locale/fr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: openstack-dashboard\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-23 11:08-0700\n" +"POT-Creation-Date: 2012-05-29 11:46-0700\n" "PO-Revision-Date: 2012-05-10 16:05+0100\n" "Last-Translator: Erwan Gallen \n" "Language-Team: French \n" @@ -475,7 +475,7 @@ msgid "Slash is not an allowed character." msgstr "Le caractère barre oblique n'est pas autorisé." #: dashboards/nova/containers/forms.py:45 -#: dashboards/nova/containers/tables.py:89 +#: dashboards/nova/containers/tables.py:88 msgid "Container Name" msgstr "Nom de conteneur" @@ -488,7 +488,7 @@ msgid "Unable to create container." msgstr "Impossible de créer le conteneur." #: dashboards/nova/containers/forms.py:59 -#: dashboards/nova/containers/tables.py:156 +#: dashboards/nova/containers/tables.py:155 msgid "Object Name" msgstr "Nom de l'objet" @@ -522,46 +522,46 @@ msgid "Unable to copy object." msgstr "Impossible de copier l'objet." #: dashboards/nova/containers/panel.py:28 -#: dashboards/nova/containers/tables.py:36 -#: dashboards/nova/containers/tables.py:100 +#: dashboards/nova/containers/tables.py:35 +#: dashboards/nova/containers/tables.py:99 #: dashboards/nova/templates/nova/containers/index.html:8 msgid "Containers" msgstr "Conteneurs" -#: dashboards/nova/containers/tables.py:35 +#: dashboards/nova/containers/tables.py:34 msgid "Container" msgstr "Conteneur" -#: dashboards/nova/containers/tables.py:43 +#: dashboards/nova/containers/tables.py:42 msgid "Containers must be empty before deletion." msgstr "" -#: dashboards/nova/containers/tables.py:49 +#: dashboards/nova/containers/tables.py:48 #: dashboards/nova/templates/nova/containers/_create.html:7 #: dashboards/nova/templates/nova/containers/_create.html:22 #: dashboards/nova/templates/nova/containers/create.html:6 msgid "Create Container" msgstr "Création d'un conteneur" -#: dashboards/nova/containers/tables.py:56 +#: dashboards/nova/containers/tables.py:55 msgid "List Objects" msgstr "Liste des objets" -#: dashboards/nova/containers/tables.py:63 +#: dashboards/nova/containers/tables.py:62 #: dashboards/nova/templates/nova/objects/_upload.html:23 #: dashboards/nova/templates/nova/objects/upload.html:3 msgid "Upload Object" msgstr "Uploader un objet" -#: dashboards/nova/containers/tables.py:91 -#: dashboards/nova/containers/tables.py:107 -#: dashboards/nova/containers/tables.py:164 +#: dashboards/nova/containers/tables.py:90 +#: dashboards/nova/containers/tables.py:106 +#: dashboards/nova/containers/tables.py:163 #: dashboards/nova/templates/nova/objects/index.html:3 msgid "Objects" msgstr "Objets" -#: dashboards/nova/containers/tables.py:93 -#: dashboards/nova/containers/tables.py:157 +#: dashboards/nova/containers/tables.py:92 +#: dashboards/nova/containers/tables.py:156 #: dashboards/nova/instances_and_volumes/instances/tables.py:243 #: dashboards/nova/instances_and_volumes/volumes/tables.py:114 #: dashboards/nova/templates/nova/images_and_snapshots/images/_detail_overview.html:30 @@ -570,15 +570,15 @@ msgstr "Objets" msgid "Size" msgstr "Taille" -#: dashboards/nova/containers/tables.py:106 +#: dashboards/nova/containers/tables.py:105 msgid "Object" msgstr "Objet" -#: dashboards/nova/containers/tables.py:117 +#: dashboards/nova/containers/tables.py:116 msgid "Copy" msgstr "Copie" -#: dashboards/nova/containers/tables.py:128 +#: dashboards/nova/containers/tables.py:127 msgid "Download" msgstr "Télécharger" @@ -602,15 +602,15 @@ msgstr "Impossible de lister les conteneurs." msgid "Images & Snapshots" msgstr "Images & Instantanés" -#: dashboards/nova/images_and_snapshots/views.py:53 +#: dashboards/nova/images_and_snapshots/views.py:60 msgid "Unable to retrieve images." msgstr "Impossible de récupérer les images." -#: dashboards/nova/images_and_snapshots/views.py:61 +#: dashboards/nova/images_and_snapshots/views.py:71 msgid "Unable to retrieve snapshots." msgstr "Impossible de récupérer les instantanés." -#: dashboards/nova/images_and_snapshots/views.py:69 +#: dashboards/nova/images_and_snapshots/views.py:79 msgid "Unable to retrieve volume snapshots." msgstr "Impossible de récupérer les instantanés de volume." @@ -856,7 +856,6 @@ msgstr "Repris" #: dashboards/nova/instances_and_volumes/instances/tables.py:144 #: dashboards/nova/instances_and_volumes/instances/workflows.py:376 -#: dashboards/nova/templates/nova/images_and_snapshots/images/launch.html:13 #: dashboards/nova/templates/nova/instances_and_volumes/instances/launch.html:3 #: dashboards/nova/templates/nova/instances_and_volumes/instances/launch.html:6 #, fuzzy @@ -920,7 +919,7 @@ msgstr "Impossible de récupérer la console VNC pour l'instance \"%s\"." msgid "Unable to retrieve instance details." msgstr "Impossible de récupérer le détail de l'instance." -#: dashboards/nova/instances_and_volumes/instances/views.py:128 +#: dashboards/nova/instances_and_volumes/instances/views.py:130 #, python-format msgid "Unable to retrieve details for instance \"%s\"." msgstr "Impossible de récupérer les informations sur l'instance \"%s\"." @@ -1049,7 +1048,6 @@ msgid "Select Image" msgstr "Sélectionnez la langue" #: dashboards/nova/instances_and_volumes/instances/workflows.py:242 -#: dashboards/nova/instances_and_volumes/instances/workflows.py:253 #, fuzzy msgid "No images available." msgstr "Aucune instance disponible" @@ -1059,6 +1057,11 @@ msgstr "Aucune instance disponible" msgid "Select Instance Snapshot" msgstr "Instantané d'instance" +#: dashboards/nova/instances_and_volumes/instances/workflows.py:253 +#, fuzzy +msgid "No snapshots available." +msgstr "Aucune instance disponible" + #: dashboards/nova/instances_and_volumes/instances/workflows.py:264 msgid "Unable to retrieve instance flavors." msgstr "Impossible de récupérer la liste des types d'instance." @@ -1853,7 +1856,7 @@ msgstr "Non autorisé." msgid "Unable to get flavor list: %s" msgstr "Impossible de récupérer la liste des types d'instance : %s" -#: dashboards/syspanel/images/views.py:45 +#: dashboards/syspanel/images/views.py:52 msgid "Unable to retrieve image list." msgstr "Impossible de récupérer la liste des images." @@ -2286,20 +2289,20 @@ msgstr "Supprimé" msgid "The attribute %(attr)s doesn't exist on %(obj)s." msgstr "L'attribut %(attr)s n'existe pas sur %(obj)s." -#: tables/base.py:671 +#: tables/base.py:679 msgid "Actions" msgstr "Actions" -#: tables/base.py:816 +#: tables/base.py:824 msgid "No items to display." msgstr "Aucun élément à afficher." -#: tables/base.py:833 +#: tables/base.py:841 #, python-format msgid "No match returned for the id \"%s\"." msgstr "Aucun résultat retourné pour l'id \"%s\"." -#: tables/base.py:940 +#: tables/base.py:948 msgid "Please select a row before taking that action." msgstr "Merci de sélectionner une ligne avant de faire cette action." diff --git a/horizon/locale/ja/LC_MESSAGES/django.po b/horizon/locale/ja/LC_MESSAGES/django.po index 10d064bb1..7e874415d 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-05-23 11:08-0700\n" +"POT-Creation-Date: 2012-05-29 11:47-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Takeshi Nakajima \n" "Language-Team: LANGUAGE \n" @@ -492,7 +492,7 @@ msgid "Slash is not an allowed character." msgstr "" #: dashboards/nova/containers/forms.py:45 -#: dashboards/nova/containers/tables.py:89 +#: dashboards/nova/containers/tables.py:88 #, fuzzy msgid "Container Name" msgstr "ユーザ名" @@ -508,7 +508,7 @@ msgid "Unable to create container." msgstr "キー%sを作成できません。" #: dashboards/nova/containers/forms.py:59 -#: dashboards/nova/containers/tables.py:156 +#: dashboards/nova/containers/tables.py:155 #, fuzzy msgid "Object Name" msgstr "ユーザ名" @@ -545,48 +545,48 @@ msgid "Unable to copy object." msgstr "" #: dashboards/nova/containers/panel.py:28 -#: dashboards/nova/containers/tables.py:36 -#: dashboards/nova/containers/tables.py:100 +#: dashboards/nova/containers/tables.py:35 +#: dashboards/nova/containers/tables.py:99 #: dashboards/nova/templates/nova/containers/index.html:8 msgid "Containers" msgstr "" -#: dashboards/nova/containers/tables.py:35 +#: dashboards/nova/containers/tables.py:34 #, fuzzy msgid "Container" msgstr "ユーザ名" -#: dashboards/nova/containers/tables.py:43 +#: dashboards/nova/containers/tables.py:42 msgid "Containers must be empty before deletion." msgstr "" -#: dashboards/nova/containers/tables.py:49 +#: dashboards/nova/containers/tables.py:48 #: dashboards/nova/templates/nova/containers/_create.html:7 #: 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:56 +#: dashboards/nova/containers/tables.py:55 msgid "List Objects" msgstr "" -#: dashboards/nova/containers/tables.py:63 +#: dashboards/nova/containers/tables.py:62 #: dashboards/nova/templates/nova/objects/_upload.html:23 #: dashboards/nova/templates/nova/objects/upload.html:3 msgid "Upload Object" msgstr "" -#: dashboards/nova/containers/tables.py:91 -#: dashboards/nova/containers/tables.py:107 -#: dashboards/nova/containers/tables.py:164 +#: dashboards/nova/containers/tables.py:90 +#: dashboards/nova/containers/tables.py:106 +#: dashboards/nova/containers/tables.py:163 #: dashboards/nova/templates/nova/objects/index.html:3 #, fuzzy msgid "Objects" msgstr "ユーザ名" -#: dashboards/nova/containers/tables.py:93 -#: dashboards/nova/containers/tables.py:157 +#: dashboards/nova/containers/tables.py:92 +#: dashboards/nova/containers/tables.py:156 #: dashboards/nova/instances_and_volumes/instances/tables.py:243 #: dashboards/nova/instances_and_volumes/volumes/tables.py:114 #: dashboards/nova/templates/nova/images_and_snapshots/images/_detail_overview.html:30 @@ -595,16 +595,16 @@ msgstr "ユーザ名" msgid "Size" msgstr "" -#: dashboards/nova/containers/tables.py:106 +#: dashboards/nova/containers/tables.py:105 #, fuzzy msgid "Object" msgstr "ユーザ名" -#: dashboards/nova/containers/tables.py:117 +#: dashboards/nova/containers/tables.py:116 msgid "Copy" msgstr "" -#: dashboards/nova/containers/tables.py:128 +#: dashboards/nova/containers/tables.py:127 msgid "Download" msgstr "" @@ -633,17 +633,17 @@ msgstr "キー%sを削除できません。" msgid "Images & Snapshots" msgstr "スナップショット" -#: dashboards/nova/images_and_snapshots/views.py:53 +#: dashboards/nova/images_and_snapshots/views.py:60 #, fuzzy msgid "Unable to retrieve images." msgstr "%sをリボーク(無効化)できません。" -#: dashboards/nova/images_and_snapshots/views.py:61 +#: dashboards/nova/images_and_snapshots/views.py:71 #, fuzzy msgid "Unable to retrieve snapshots." msgstr "キー%sを作成できません。" -#: dashboards/nova/images_and_snapshots/views.py:69 +#: dashboards/nova/images_and_snapshots/views.py:79 #, fuzzy msgid "Unable to retrieve volume snapshots." msgstr "ボリューム%sを作成できません。" @@ -909,7 +909,6 @@ msgstr "" #: dashboards/nova/instances_and_volumes/instances/tables.py:144 #: dashboards/nova/instances_and_volumes/instances/workflows.py:376 -#: dashboards/nova/templates/nova/images_and_snapshots/images/launch.html:13 #: dashboards/nova/templates/nova/instances_and_volumes/instances/launch.html:3 #: dashboards/nova/templates/nova/instances_and_volumes/instances/launch.html:6 msgid "Launch Instance" @@ -975,7 +974,7 @@ msgstr "インスタンス%(inst)s: %(msg)sを更新する事ができません msgid "Unable to retrieve instance details." msgstr "%sをリボーク(無効化)できません。" -#: dashboards/nova/instances_and_volumes/instances/views.py:128 +#: dashboards/nova/instances_and_volumes/instances/views.py:130 #, fuzzy, python-format msgid "Unable to retrieve details for instance \"%s\"." msgstr "%sをリボーク(無効化)できません。" @@ -1110,7 +1109,6 @@ msgid "Select Image" msgstr "言語を選択" #: dashboards/nova/instances_and_volumes/instances/workflows.py:242 -#: dashboards/nova/instances_and_volumes/instances/workflows.py:253 #, fuzzy msgid "No images available." msgstr "現在イメージがありません。" @@ -1120,6 +1118,11 @@ msgstr "現在イメージがありません。" msgid "Select Instance Snapshot" msgstr "スナップショット" +#: dashboards/nova/instances_and_volumes/instances/workflows.py:253 +#, fuzzy +msgid "No snapshots available." +msgstr "現在イメージがありません。" + #: dashboards/nova/instances_and_volumes/instances/workflows.py:264 #, fuzzy msgid "Unable to retrieve instance flavors." @@ -1921,7 +1924,7 @@ msgstr "%sを認証できません。" msgid "Unable to get flavor list: %s" msgstr "%sをリボーク(無効化)できません。" -#: dashboards/syspanel/images/views.py:45 +#: dashboards/syspanel/images/views.py:52 #, fuzzy msgid "Unable to retrieve image list." msgstr "キー%sを作成できません。" @@ -2386,20 +2389,20 @@ msgstr "削除" msgid "The attribute %(attr)s doesn't exist on %(obj)s." msgstr "" -#: tables/base.py:671 +#: tables/base.py:679 msgid "Actions" msgstr "アクション" -#: tables/base.py:816 +#: tables/base.py:824 msgid "No items to display." msgstr "" -#: tables/base.py:833 +#: tables/base.py:841 #, python-format msgid "No match returned for the id \"%s\"." msgstr "" -#: tables/base.py:940 +#: tables/base.py:948 msgid "Please select a row before taking that action." msgstr "" diff --git a/horizon/locale/pl/LC_MESSAGES/django.po b/horizon/locale/pl/LC_MESSAGES/django.po index 64554efd0..6ee974093 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-05-23 11:08-0700\n" +"POT-Creation-Date: 2012-05-29 11:47-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" @@ -463,7 +463,7 @@ msgid "Slash is not an allowed character." msgstr "" #: dashboards/nova/containers/forms.py:45 -#: dashboards/nova/containers/tables.py:89 +#: dashboards/nova/containers/tables.py:88 msgid "Container Name" msgstr "" @@ -476,7 +476,7 @@ msgid "Unable to create container." msgstr "" #: dashboards/nova/containers/forms.py:59 -#: dashboards/nova/containers/tables.py:156 +#: dashboards/nova/containers/tables.py:155 msgid "Object Name" msgstr "" @@ -510,46 +510,46 @@ msgid "Unable to copy object." msgstr "" #: dashboards/nova/containers/panel.py:28 -#: dashboards/nova/containers/tables.py:36 -#: dashboards/nova/containers/tables.py:100 +#: dashboards/nova/containers/tables.py:35 +#: dashboards/nova/containers/tables.py:99 #: dashboards/nova/templates/nova/containers/index.html:8 msgid "Containers" msgstr "" -#: dashboards/nova/containers/tables.py:35 +#: dashboards/nova/containers/tables.py:34 msgid "Container" msgstr "" -#: dashboards/nova/containers/tables.py:43 +#: dashboards/nova/containers/tables.py:42 msgid "Containers must be empty before deletion." msgstr "" -#: dashboards/nova/containers/tables.py:49 +#: dashboards/nova/containers/tables.py:48 #: dashboards/nova/templates/nova/containers/_create.html:7 #: 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:56 +#: dashboards/nova/containers/tables.py:55 msgid "List Objects" msgstr "" -#: dashboards/nova/containers/tables.py:63 +#: dashboards/nova/containers/tables.py:62 #: dashboards/nova/templates/nova/objects/_upload.html:23 #: dashboards/nova/templates/nova/objects/upload.html:3 msgid "Upload Object" msgstr "" -#: dashboards/nova/containers/tables.py:91 -#: dashboards/nova/containers/tables.py:107 -#: dashboards/nova/containers/tables.py:164 +#: dashboards/nova/containers/tables.py:90 +#: dashboards/nova/containers/tables.py:106 +#: dashboards/nova/containers/tables.py:163 #: dashboards/nova/templates/nova/objects/index.html:3 msgid "Objects" msgstr "" -#: dashboards/nova/containers/tables.py:93 -#: dashboards/nova/containers/tables.py:157 +#: dashboards/nova/containers/tables.py:92 +#: dashboards/nova/containers/tables.py:156 #: dashboards/nova/instances_and_volumes/instances/tables.py:243 #: dashboards/nova/instances_and_volumes/volumes/tables.py:114 #: dashboards/nova/templates/nova/images_and_snapshots/images/_detail_overview.html:30 @@ -558,15 +558,15 @@ msgstr "" msgid "Size" msgstr "" -#: dashboards/nova/containers/tables.py:106 +#: dashboards/nova/containers/tables.py:105 msgid "Object" msgstr "" -#: dashboards/nova/containers/tables.py:117 +#: dashboards/nova/containers/tables.py:116 msgid "Copy" msgstr "" -#: dashboards/nova/containers/tables.py:128 +#: dashboards/nova/containers/tables.py:127 msgid "Download" msgstr "" @@ -590,15 +590,15 @@ msgstr "" msgid "Images & Snapshots" msgstr "" -#: dashboards/nova/images_and_snapshots/views.py:53 +#: dashboards/nova/images_and_snapshots/views.py:60 msgid "Unable to retrieve images." msgstr "" -#: dashboards/nova/images_and_snapshots/views.py:61 +#: dashboards/nova/images_and_snapshots/views.py:71 msgid "Unable to retrieve snapshots." msgstr "" -#: dashboards/nova/images_and_snapshots/views.py:69 +#: dashboards/nova/images_and_snapshots/views.py:79 msgid "Unable to retrieve volume snapshots." msgstr "" @@ -843,7 +843,6 @@ msgstr "" #: dashboards/nova/instances_and_volumes/instances/tables.py:144 #: dashboards/nova/instances_and_volumes/instances/workflows.py:376 -#: dashboards/nova/templates/nova/images_and_snapshots/images/launch.html:13 #: dashboards/nova/templates/nova/instances_and_volumes/instances/launch.html:3 #: dashboards/nova/templates/nova/instances_and_volumes/instances/launch.html:6 msgid "Launch Instance" @@ -906,7 +905,7 @@ msgstr "" msgid "Unable to retrieve instance details." msgstr "" -#: dashboards/nova/instances_and_volumes/instances/views.py:128 +#: dashboards/nova/instances_and_volumes/instances/views.py:130 #, python-format msgid "Unable to retrieve details for instance \"%s\"." msgstr "" @@ -1027,7 +1026,6 @@ msgid "Select Image" msgstr "" #: dashboards/nova/instances_and_volumes/instances/workflows.py:242 -#: dashboards/nova/instances_and_volumes/instances/workflows.py:253 msgid "No images available." msgstr "" @@ -1035,6 +1033,10 @@ msgstr "" msgid "Select Instance Snapshot" msgstr "" +#: dashboards/nova/instances_and_volumes/instances/workflows.py:253 +msgid "No snapshots available." +msgstr "" + #: dashboards/nova/instances_and_volumes/instances/workflows.py:264 msgid "Unable to retrieve instance flavors." msgstr "" @@ -1781,7 +1783,7 @@ msgstr "" msgid "Unable to get flavor list: %s" msgstr "" -#: dashboards/syspanel/images/views.py:45 +#: dashboards/syspanel/images/views.py:52 msgid "Unable to retrieve image list." msgstr "" @@ -2203,20 +2205,20 @@ msgstr "" msgid "The attribute %(attr)s doesn't exist on %(obj)s." msgstr "" -#: tables/base.py:671 +#: tables/base.py:679 msgid "Actions" msgstr "" -#: tables/base.py:816 +#: tables/base.py:824 msgid "No items to display." msgstr "" -#: tables/base.py:833 +#: tables/base.py:841 #, python-format msgid "No match returned for the id \"%s\"." msgstr "" -#: tables/base.py:940 +#: tables/base.py:948 msgid "Please select a row before taking that action." msgstr "" diff --git a/horizon/locale/zh_CN/LC_MESSAGES/django.po b/horizon/locale/zh_CN/LC_MESSAGES/django.po index e3a3d41ce..7b8c59612 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: openstack-dashboard\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-23 11:07-0700\n" +"POT-Creation-Date: 2012-05-29 11:47-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ZHANG Hua \n" "Language-Team: Simplified Chinese \n" @@ -468,7 +468,7 @@ msgid "Slash is not an allowed character." msgstr "斜线不是合法字符" #: dashboards/nova/containers/forms.py:45 -#: dashboards/nova/containers/tables.py:89 +#: dashboards/nova/containers/tables.py:88 msgid "Container Name" msgstr "容器名称" @@ -481,7 +481,7 @@ msgid "Unable to create container." msgstr "无法创建容器" #: dashboards/nova/containers/forms.py:59 -#: dashboards/nova/containers/tables.py:156 +#: dashboards/nova/containers/tables.py:155 msgid "Object Name" msgstr "对象名称" @@ -515,46 +515,46 @@ msgid "Unable to copy object." msgstr "无法拷贝对象。" #: dashboards/nova/containers/panel.py:28 -#: dashboards/nova/containers/tables.py:36 -#: dashboards/nova/containers/tables.py:100 +#: dashboards/nova/containers/tables.py:35 +#: dashboards/nova/containers/tables.py:99 #: dashboards/nova/templates/nova/containers/index.html:8 msgid "Containers" msgstr "容器" -#: dashboards/nova/containers/tables.py:35 +#: dashboards/nova/containers/tables.py:34 msgid "Container" msgstr "容器" -#: dashboards/nova/containers/tables.py:43 +#: dashboards/nova/containers/tables.py:42 msgid "Containers must be empty before deletion." msgstr "" -#: dashboards/nova/containers/tables.py:49 +#: dashboards/nova/containers/tables.py:48 #: dashboards/nova/templates/nova/containers/_create.html:7 #: 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:56 +#: dashboards/nova/containers/tables.py:55 msgid "List Objects" msgstr "列出对象" -#: dashboards/nova/containers/tables.py:63 +#: dashboards/nova/containers/tables.py:62 #: dashboards/nova/templates/nova/objects/_upload.html:23 #: dashboards/nova/templates/nova/objects/upload.html:3 msgid "Upload Object" msgstr "上传对象" -#: dashboards/nova/containers/tables.py:91 -#: dashboards/nova/containers/tables.py:107 -#: dashboards/nova/containers/tables.py:164 +#: dashboards/nova/containers/tables.py:90 +#: dashboards/nova/containers/tables.py:106 +#: dashboards/nova/containers/tables.py:163 #: dashboards/nova/templates/nova/objects/index.html:3 msgid "Objects" msgstr "对象" -#: dashboards/nova/containers/tables.py:93 -#: dashboards/nova/containers/tables.py:157 +#: dashboards/nova/containers/tables.py:92 +#: dashboards/nova/containers/tables.py:156 #: dashboards/nova/instances_and_volumes/instances/tables.py:243 #: dashboards/nova/instances_and_volumes/volumes/tables.py:114 #: dashboards/nova/templates/nova/images_and_snapshots/images/_detail_overview.html:30 @@ -563,15 +563,15 @@ msgstr "对象" msgid "Size" msgstr "大小" -#: dashboards/nova/containers/tables.py:106 +#: dashboards/nova/containers/tables.py:105 msgid "Object" msgstr "对象" -#: dashboards/nova/containers/tables.py:117 +#: dashboards/nova/containers/tables.py:116 msgid "Copy" msgstr "拷贝" -#: dashboards/nova/containers/tables.py:128 +#: dashboards/nova/containers/tables.py:127 msgid "Download" msgstr "下载" @@ -595,15 +595,15 @@ msgstr "无法列出容器" msgid "Images & Snapshots" msgstr "镜像和快照" -#: dashboards/nova/images_and_snapshots/views.py:53 +#: dashboards/nova/images_and_snapshots/views.py:60 msgid "Unable to retrieve images." msgstr "无法获取镜像" -#: dashboards/nova/images_and_snapshots/views.py:61 +#: dashboards/nova/images_and_snapshots/views.py:71 msgid "Unable to retrieve snapshots." msgstr "无法获取快照" -#: dashboards/nova/images_and_snapshots/views.py:69 +#: dashboards/nova/images_and_snapshots/views.py:79 msgid "Unable to retrieve volume snapshots." msgstr "无法获取卷快照" @@ -849,7 +849,6 @@ msgstr "已恢复" #: dashboards/nova/instances_and_volumes/instances/tables.py:144 #: dashboards/nova/instances_and_volumes/instances/workflows.py:376 -#: dashboards/nova/templates/nova/images_and_snapshots/images/launch.html:13 #: dashboards/nova/templates/nova/instances_and_volumes/instances/launch.html:3 #: dashboards/nova/templates/nova/instances_and_volumes/instances/launch.html:6 msgid "Launch Instance" @@ -912,7 +911,7 @@ msgstr "无法获得实例 \"%s\" 的VNC控制台" msgid "Unable to retrieve instance details." msgstr "无法获取实例详情。" -#: dashboards/nova/instances_and_volumes/instances/views.py:128 +#: dashboards/nova/instances_and_volumes/instances/views.py:130 #, python-format msgid "Unable to retrieve details for instance \"%s\"." msgstr "无法获取实例 \"%s\" 的详情。" @@ -1040,7 +1039,6 @@ msgid "Select Image" msgstr "选择语言" #: dashboards/nova/instances_and_volumes/instances/workflows.py:242 -#: dashboards/nova/instances_and_volumes/instances/workflows.py:253 #, fuzzy msgid "No images available." msgstr "无可用实例" @@ -1050,6 +1048,11 @@ msgstr "无可用实例" msgid "Select Instance Snapshot" msgstr "实例快照" +#: dashboards/nova/instances_and_volumes/instances/workflows.py:253 +#, fuzzy +msgid "No snapshots available." +msgstr "无可用实例" + #: dashboards/nova/instances_and_volumes/instances/workflows.py:264 msgid "Unable to retrieve instance flavors." msgstr "无法获取实例类型" @@ -1816,7 +1819,7 @@ msgstr "未授权" msgid "Unable to get flavor list: %s" msgstr "无法获得类型列表： %s" -#: dashboards/syspanel/images/views.py:45 +#: dashboards/syspanel/images/views.py:52 msgid "Unable to retrieve image list." msgstr "无法获得镜像列表。" @@ -2241,20 +2244,20 @@ msgstr "被删除" msgid "The attribute %(attr)s doesn't exist on %(obj)s." msgstr "属性 %(attr)s 并不存在于 %(obj)s。" -#: tables/base.py:671 +#: tables/base.py:679 msgid "Actions" msgstr "动作" -#: tables/base.py:816 +#: tables/base.py:824 msgid "No items to display." msgstr "没有条目显示。" -#: tables/base.py:833 +#: tables/base.py:841 #, python-format msgid "No match returned for the id \"%s\"." msgstr "id \"%s\" 没有匹配返回。" -#: tables/base.py:940 +#: tables/base.py:948 msgid "Please select a row before taking that action." msgstr "请在执行前选择一行。" diff --git a/horizon/locale/zh_TW/LC_MESSAGES/django.po b/horizon/locale/zh_TW/LC_MESSAGES/django.po index ccccade13..a43984e6f 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-05-23 11:08-0700\n" +"POT-Creation-Date: 2012-05-29 11:47-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Andy Chong \n" "Language-Team: LANGUAGE \n" @@ -469,7 +469,7 @@ msgid "Slash is not an allowed character." msgstr "斜線符號不能被接受" #: dashboards/nova/containers/forms.py:45 -#: dashboards/nova/containers/tables.py:89 +#: dashboards/nova/containers/tables.py:88 msgid "Container Name" msgstr "容器名稱" @@ -482,7 +482,7 @@ msgid "Unable to create container." msgstr "無法建立容器" #: dashboards/nova/containers/forms.py:59 -#: dashboards/nova/containers/tables.py:156 +#: dashboards/nova/containers/tables.py:155 msgid "Object Name" msgstr "物件名稱" @@ -516,46 +516,46 @@ msgid "Unable to copy object." msgstr "無法複製物件" #: dashboards/nova/containers/panel.py:28 -#: dashboards/nova/containers/tables.py:36 -#: dashboards/nova/containers/tables.py:100 +#: dashboards/nova/containers/tables.py:35 +#: dashboards/nova/containers/tables.py:99 #: dashboards/nova/templates/nova/containers/index.html:8 msgid "Containers" msgstr "容器" -#: dashboards/nova/containers/tables.py:35 +#: dashboards/nova/containers/tables.py:34 msgid "Container" msgstr "容器" -#: dashboards/nova/containers/tables.py:43 +#: dashboards/nova/containers/tables.py:42 msgid "Containers must be empty before deletion." msgstr "" -#: dashboards/nova/containers/tables.py:49 +#: dashboards/nova/containers/tables.py:48 #: dashboards/nova/templates/nova/containers/_create.html:7 #: 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:56 +#: dashboards/nova/containers/tables.py:55 msgid "List Objects" msgstr "列出物件" -#: dashboards/nova/containers/tables.py:63 +#: dashboards/nova/containers/tables.py:62 #: dashboards/nova/templates/nova/objects/_upload.html:23 #: dashboards/nova/templates/nova/objects/upload.html:3 msgid "Upload Object" msgstr "上傳物件" -#: dashboards/nova/containers/tables.py:91 -#: dashboards/nova/containers/tables.py:107 -#: dashboards/nova/containers/tables.py:164 +#: dashboards/nova/containers/tables.py:90 +#: dashboards/nova/containers/tables.py:106 +#: dashboards/nova/containers/tables.py:163 #: dashboards/nova/templates/nova/objects/index.html:3 msgid "Objects" msgstr "物件" -#: dashboards/nova/containers/tables.py:93 -#: dashboards/nova/containers/tables.py:157 +#: dashboards/nova/containers/tables.py:92 +#: dashboards/nova/containers/tables.py:156 #: dashboards/nova/instances_and_volumes/instances/tables.py:243 #: dashboards/nova/instances_and_volumes/volumes/tables.py:114 #: dashboards/nova/templates/nova/images_and_snapshots/images/_detail_overview.html:30 @@ -564,15 +564,15 @@ msgstr "物件" msgid "Size" msgstr "大小" -#: dashboards/nova/containers/tables.py:106 +#: dashboards/nova/containers/tables.py:105 msgid "Object" msgstr "物件" -#: dashboards/nova/containers/tables.py:117 +#: dashboards/nova/containers/tables.py:116 msgid "Copy" msgstr "複製" -#: dashboards/nova/containers/tables.py:128 +#: dashboards/nova/containers/tables.py:127 msgid "Download" msgstr "下載" @@ -596,15 +596,15 @@ msgstr "無法列出容器。" msgid "Images & Snapshots" msgstr "映像 & 快照" -#: dashboards/nova/images_and_snapshots/views.py:53 +#: dashboards/nova/images_and_snapshots/views.py:60 msgid "Unable to retrieve images." msgstr "無法取得映像。" -#: dashboards/nova/images_and_snapshots/views.py:61 +#: dashboards/nova/images_and_snapshots/views.py:71 msgid "Unable to retrieve snapshots." msgstr "無法取得快照。" -#: dashboards/nova/images_and_snapshots/views.py:69 +#: dashboards/nova/images_and_snapshots/views.py:79 msgid "Unable to retrieve volume snapshots." msgstr "無法取得空間快照" @@ -850,7 +850,6 @@ msgstr "已喚醒" #: dashboards/nova/instances_and_volumes/instances/tables.py:144 #: dashboards/nova/instances_and_volumes/instances/workflows.py:376 -#: dashboards/nova/templates/nova/images_and_snapshots/images/launch.html:13 #: dashboards/nova/templates/nova/instances_and_volumes/instances/launch.html:3 #: dashboards/nova/templates/nova/instances_and_volumes/instances/launch.html:6 msgid "Launch Instance" @@ -913,7 +912,7 @@ msgstr "無法取得執行個體的VNC界面\"%s\"。" msgid "Unable to retrieve instance details." msgstr "無法取得執行個體的詳細資料" -#: dashboards/nova/instances_and_volumes/instances/views.py:128 +#: dashboards/nova/instances_and_volumes/instances/views.py:130 #, python-format msgid "Unable to retrieve details for instance \"%s\"." msgstr "無法取得執行個體\"%s\"詳細資料。" @@ -1040,7 +1039,6 @@ msgid "Select Image" msgstr "選擇語言" #: dashboards/nova/instances_and_volumes/instances/workflows.py:242 -#: dashboards/nova/instances_and_volumes/instances/workflows.py:253 #, fuzzy msgid "No images available." msgstr "沒有可用的執行個體" @@ -1050,6 +1048,11 @@ msgstr "沒有可用的執行個體" msgid "Select Instance Snapshot" msgstr "執行個體快照" +#: dashboards/nova/instances_and_volumes/instances/workflows.py:253 +#, fuzzy +msgid "No snapshots available." +msgstr "沒有可用的執行個體" + #: dashboards/nova/instances_and_volumes/instances/workflows.py:264 msgid "Unable to retrieve instance flavors." msgstr "無法取得執行個體規格。" @@ -1817,7 +1820,7 @@ msgstr "權限不足" msgid "Unable to get flavor list: %s" msgstr "無法取得規格列表： %s" -#: dashboards/syspanel/images/views.py:45 +#: dashboards/syspanel/images/views.py:52 msgid "Unable to retrieve image list." msgstr "無法取得映像列表" @@ -2246,20 +2249,20 @@ msgstr "已刪除" msgid "The attribute %(attr)s doesn't exist on %(obj)s." msgstr "此屬性%(attr)s並不在%(obj)s上存在。" -#: tables/base.py:671 +#: tables/base.py:679 msgid "Actions" msgstr "動作" -#: tables/base.py:816 +#: tables/base.py:824 msgid "No items to display." msgstr "沒有任何相關項目" -#: tables/base.py:833 +#: tables/base.py:841 #, python-format msgid "No match returned for the id \"%s\"." msgstr "找不到id \"%s\"的相關項目" -#: tables/base.py:940 +#: tables/base.py:948 msgid "Please select a row before taking that action." msgstr "請選擇一個欄位後才執行動作" diff --git a/horizon/static/horizon/js/horizon.js b/horizon/static/horizon/js/horizon.js index 8e0ac2ce3..7485ac2df 100644 --- a/horizon/static/horizon/js/horizon.js +++ b/horizon/static/horizon/js/horizon.js @@ -259,7 +259,7 @@ var Horizon = function() { /* Namespace for core functionality related to client-side templating. */ horizon.templates = { - template_ids: ["#modal_template", "#empty_row_template", "#alert_message_template"], + template_ids: ["#modal_template", "#empty_row_template", "#alert_message_template", "#spinner-modal"], compiled_templates: {} }; @@ -270,20 +270,6 @@ var Horizon = function() { }); }; - /* Namespace for core functionality related to modal dialogs. */ - horizon.modals = {}; - - /* Creates a modal dialog from the client-side template. */ - horizon.modals.create = function (title, body, confirm, cancel) { - if (!cancel) { - cancel = "Cancel"; - } - var template = horizon.templates.compiled_templates["#modal_template"], - params = {title: title, body: body, confirm: confirm, cancel: cancel}, - modal = $(template.render(params)).appendTo("body"); - return modal; - }; - /* Utilities for common needs which aren't JS builtins. */ horizon.utils = { capitalize: function(string) { diff --git a/horizon/static/horizon/js/modals.js b/horizon/static/horizon/js/modals.js index ecdff461e..604956fe9 100644 --- a/horizon/static/horizon/js/modals.js +++ b/horizon/static/horizon/js/modals.js @@ -1,5 +1,32 @@ -// Storage for our current jqXHR object. -horizon.modals._request = null; +/* Namespace for core functionality related to modal dialogs. */ +horizon.modals = { + // Storage for our current jqXHR object. + _request: null, + spinner: null, + + spinner_options: { + lines: 10, + length: 15, + width: 4, + radius: 10, + color: '#000', + speed: 0.8, + trail: 50 + } +}; + + +/* Creates a modal dialog from the client-side template. */ +horizon.modals.create = function (title, body, confirm, cancel) { + if (!cancel) { + cancel = "Cancel"; + } + var template = horizon.templates.compiled_templates["#modal_template"], + params = {title: title, body: body, confirm: confirm, cancel: cancel}, + modal = $(template.render(params)).appendTo("body"); + return modal; +}; + horizon.modals.success = function (data, textStatus, jqXHR) { $('body').append(data); @@ -77,9 +104,18 @@ horizon.addInitFunction(function() { } horizon.modals._request = $.ajax($this.attr('href'), { + beforeSend: function() { + var template = horizon.templates.compiled_templates["#spinner-modal"]; + horizon.modals.spinner = $(template.render()); + + horizon.modals.spinner.appendTo("body"); + horizon.modals.spinner.modal({backdrop: 'static'}); + horizon.modals.spinner.spin(horizon.modals.spinner_options); + }, complete: function () { // Clear the global storage; horizon.modals._request = null; + horizon.modals.spinner.modal('hide'); }, error: function(jqXHR, status, errorThrown) { if (jqXHR.status === 401){ diff --git a/horizon/templates/horizon/client_side/_loading.html b/horizon/templates/horizon/client_side/_loading.html new file mode 100644 index 000000000..b0ed30259 --- /dev/null +++ b/horizon/templates/horizon/client_side/_loading.html @@ -0,0 +1,12 @@ +{% extends "horizon/client_side/template.html" %} +{% load i18n horizon %} + +{% block id %}spinner-modal{% endblock %} + +{% block template %} +{% jstemplate %} +
+

{% trans "Loading…" %}

+
+{% endjstemplate %} +{% endblock %} diff --git a/horizon/templates/horizon/client_side/templates.html b/horizon/templates/horizon/client_side/templates.html index 634b7a572..59aa74652 100644 --- a/horizon/templates/horizon/client_side/templates.html +++ b/horizon/templates/horizon/client_side/templates.html @@ -1,3 +1,4 @@ {% include "horizon/client_side/_modal.html" %} {% include "horizon/client_side/_table_row.html" %} {% include "horizon/client_side/_alert_message.html" %} +{% include "horizon/client_side/_loading.html" %} diff --git a/openstack_dashboard/locale/en/LC_MESSAGES/django.po b/openstack_dashboard/locale/en/LC_MESSAGES/django.po index 090266d6d..eab5e67c6 100644 --- a/openstack_dashboard/locale/en/LC_MESSAGES/django.po +++ b/openstack_dashboard/locale/en/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-05-23 11:08-0700\n" +"POT-Creation-Date: 2012-05-29 11:47-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -53,6 +53,10 @@ msgstr "" msgid "Traditional Chinese" msgstr "" +#: local/local_settings.py:17 +msgid "Your password must be at least 6 characters long." +msgstr "" + #: templates/403.html:4 templates/403.html.py:9 msgid "Forbidden" msgstr "" @@ -99,6 +103,10 @@ msgstr "" msgid "Sign Out" msgstr "" +#: templates/_scripts.html:39 +msgid "Loading…" +msgstr "" + #: templates/switch_tenants.html:12 msgid "Log-in to tenant" msgstr "" diff --git a/openstack_dashboard/locale/es/LC_MESSAGES/django.po b/openstack_dashboard/locale/es/LC_MESSAGES/django.po index 3a1e1a10a..19f4c3d09 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-05-23 11:08-0700\n" +"POT-Creation-Date: 2012-05-29 11:47-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,6 +54,10 @@ msgstr "" msgid "Traditional Chinese" msgstr "" +#: local/local_settings.py:17 +msgid "Your password must be at least 6 characters long." +msgstr "" + #: templates/403.html:4 templates/403.html.py:9 msgid "Forbidden" msgstr "" @@ -100,6 +104,10 @@ msgstr "" msgid "Sign Out" msgstr "" +#: templates/_scripts.html:39 +msgid "Loading…" +msgstr "" + #: templates/switch_tenants.html:12 msgid "Log-in to tenant" msgstr "" diff --git a/openstack_dashboard/locale/fr/LC_MESSAGES/django.po b/openstack_dashboard/locale/fr/LC_MESSAGES/django.po index bcd275ac0..bacab8c6e 100644 --- a/openstack_dashboard/locale/fr/LC_MESSAGES/django.po +++ b/openstack_dashboard/locale/fr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: openstack-dashboard\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-23 11:08-0700\n" +"POT-Creation-Date: 2012-05-29 11:47-0700\n" "PO-Revision-Date: 2012-05-08 00:20+0100\n" "Last-Translator: Erwan Gallen \n" "Language-Team: French \n" @@ -52,6 +52,10 @@ msgstr "Chinois simplifié" msgid "Traditional Chinese" msgstr "Chinois traditionnel" +#: local/local_settings.py:17 +msgid "Your password must be at least 6 characters long." +msgstr "" + #: templates/403.html:4 templates/403.html.py:9 msgid "Forbidden" msgstr "Interdit" @@ -101,6 +105,10 @@ msgstr "Réglages" msgid "Sign Out" msgstr "Déconnexion" +#: templates/_scripts.html:39 +msgid "Loading…" +msgstr "" + #: templates/switch_tenants.html:12 msgid "Log-in to tenant" msgstr "Se connecter au tenant" diff --git a/openstack_dashboard/locale/ja/LC_MESSAGES/django.po b/openstack_dashboard/locale/ja/LC_MESSAGES/django.po index ee9f34a5d..c404c6ee3 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-05-23 11:08-0700\n" +"POT-Creation-Date: 2012-05-29 11:47-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,6 +54,10 @@ msgstr "" msgid "Traditional Chinese" msgstr "" +#: local/local_settings.py:17 +msgid "Your password must be at least 6 characters long." +msgstr "" + #: templates/403.html:4 templates/403.html.py:9 msgid "Forbidden" msgstr "" @@ -100,6 +104,10 @@ msgstr "" msgid "Sign Out" msgstr "" +#: templates/_scripts.html:39 +msgid "Loading…" +msgstr "" + #: templates/switch_tenants.html:12 msgid "Log-in to tenant" msgstr "" diff --git a/openstack_dashboard/locale/pl/LC_MESSAGES/django.po b/openstack_dashboard/locale/pl/LC_MESSAGES/django.po index b38f9bb63..9880c347d 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-05-23 11:08-0700\n" +"POT-Creation-Date: 2012-05-29 11:47-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -55,6 +55,10 @@ msgstr "" msgid "Traditional Chinese" msgstr "" +#: local/local_settings.py:17 +msgid "Your password must be at least 6 characters long." +msgstr "" + #: templates/403.html:4 templates/403.html.py:9 msgid "Forbidden" msgstr "" @@ -101,6 +105,10 @@ msgstr "" msgid "Sign Out" msgstr "" +#: templates/_scripts.html:39 +msgid "Loading…" +msgstr "" + #: templates/switch_tenants.html:12 msgid "Log-in to tenant" msgstr "" diff --git a/openstack_dashboard/locale/pt/LC_MESSAGES/django.po b/openstack_dashboard/locale/pt/LC_MESSAGES/django.po index 3a1e1a10a..19f4c3d09 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-05-23 11:08-0700\n" +"POT-Creation-Date: 2012-05-29 11:47-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,6 +54,10 @@ msgstr "" msgid "Traditional Chinese" msgstr "" +#: local/local_settings.py:17 +msgid "Your password must be at least 6 characters long." +msgstr "" + #: templates/403.html:4 templates/403.html.py:9 msgid "Forbidden" msgstr "" @@ -100,6 +104,10 @@ msgstr "" msgid "Sign Out" msgstr "" +#: templates/_scripts.html:39 +msgid "Loading…" +msgstr "" + #: templates/switch_tenants.html:12 msgid "Log-in to tenant" msgstr "" diff --git a/openstack_dashboard/locale/zh_CN/LC_MESSAGES/django.po b/openstack_dashboard/locale/zh_CN/LC_MESSAGES/django.po index 090266d6d..eab5e67c6 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-05-23 11:08-0700\n" +"POT-Creation-Date: 2012-05-29 11:47-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -53,6 +53,10 @@ msgstr "" msgid "Traditional Chinese" msgstr "" +#: local/local_settings.py:17 +msgid "Your password must be at least 6 characters long." +msgstr "" + #: templates/403.html:4 templates/403.html.py:9 msgid "Forbidden" msgstr "" @@ -99,6 +103,10 @@ msgstr "" msgid "Sign Out" msgstr "" +#: templates/_scripts.html:39 +msgid "Loading…" +msgstr "" + #: templates/switch_tenants.html:12 msgid "Log-in to tenant" msgstr "" diff --git a/openstack_dashboard/locale/zh_TW/LC_MESSAGES/django.po b/openstack_dashboard/locale/zh_TW/LC_MESSAGES/django.po index be154a2fd..507d55866 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-05-23 11:08-0700\n" +"POT-Creation-Date: 2012-05-29 11:47-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -53,6 +53,10 @@ msgstr "" msgid "Traditional Chinese" msgstr "" +#: local/local_settings.py:17 +msgid "Your password must be at least 6 characters long." +msgstr "" + #: templates/403.html:4 templates/403.html.py:9 msgid "Forbidden" msgstr "禁止" @@ -99,6 +103,10 @@ msgstr "設定" msgid "Sign Out" msgstr "登出" +#: templates/_scripts.html:39 +msgid "Loading…" +msgstr "" + #: templates/switch_tenants.html:12 msgid "Log-in to tenant" msgstr "登入到租戶" diff --git a/openstack_dashboard/static/dashboard/css/style.css b/openstack_dashboard/static/dashboard/css/style.css index 35d63f022..fa8883568 100644 --- a/openstack_dashboard/static/dashboard/css/style.css +++ b/openstack_dashboard/static/dashboard/css/style.css @@ -556,6 +556,20 @@ form label { position: absolute; } +.modal.loading { + width: 150px; + height: 150px; + margin: 0 auto; + overflow: hidden; +} + +.modal.loading p { + text-align: center; + position: absolute; + bottom: 0; + width: 150px; +} + form.horizontal .form-field { float: left; } diff --git a/openstack_dashboard/templates/_footer.html b/openstack_dashboard/templates/_footer.html deleted file mode 100644 index 3aad1ddc1..000000000 --- a/openstack_dashboard/templates/_footer.html +++ /dev/null @@ -1 +0,0 @@ -FOOTER