Imported Translations from Transifex

Change-Id: I79a7551378872d60bea0b516dd6ed59bf6cdcc39

diff --git a/cinder/locale/bg_BG/LC_MESSAGES/cinder.po b/cinder/locale/bg_BG/LC_MESSAGES/cinder.po
index 7851288894bb6e5ea750ca49b25250edb76ad3a2..6796b59d96fb1b4d695f3c49c1d07fc93bbe8dd6 100644 (file)
--- a/cinder/locale/bg_BG/LC_MESSAGES/cinder.po
+++ b/cinder/locale/bg_BG/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-05-08 11:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian (Bulgaria) "
@@ -792,11 +792,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -944,12 +939,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -968,7 +963,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1002,7 +997,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1013,12 +1008,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1051,11 +1046,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1135,28 +1130,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1909,25 +1904,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2066,6 +2061,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2762,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2962,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3044,125 +3049,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5867,6 +5872,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/bs/LC_MESSAGES/cinder.po b/cinder/locale/bs/LC_MESSAGES/cinder.po
index 65efe876cd4b22f5d7ab19e007396f32095ee678..fe7f345b749f3c0e1d2d2b5bcdd9054d47e8827b 100644 (file)
--- a/cinder/locale/bs/LC_MESSAGES/cinder.po
+++ b/cinder/locale/bs/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2012-01-19 20:22+0000\n"
 "Last-Translator: yazar  <zrncescientiae@gmail.com>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
@@ -791,11 +791,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -943,12 +938,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -967,7 +962,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1001,7 +996,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1012,12 +1007,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1050,11 +1045,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1134,28 +1129,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1913,25 +1908,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2070,6 +2065,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2766,7 +2771,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2970,7 +2975,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3052,125 +3057,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5875,6 +5880,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr "Neočekivana greška prilikom pokretanja komande."
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/ca/LC_MESSAGES/cinder.po b/cinder/locale/ca/LC_MESSAGES/cinder.po
index 824eadfb4eb81a9481a56dd6170021ca314df3ad..f8a44fe945d1944471684c45ab738cf64405cdc4 100644 (file)
--- a/cinder/locale/ca/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ca/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Catalan "
@@ -792,11 +792,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -944,12 +939,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -968,7 +963,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1002,7 +997,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1013,12 +1008,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1051,11 +1046,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1135,28 +1130,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1909,25 +1904,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2066,6 +2061,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2762,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2962,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3044,125 +3049,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5867,6 +5872,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/cinder.pot b/cinder/locale/cinder.pot
index 135f35d3df4f864a451ea91c8b5048c7885f1141..dc889263b184bf7d075dad6a6374ed701c76ea9d 100644 (file)
--- a/cinder/locale/cinder.pot
+++ b/cinder/locale/cinder.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: cinder jenkins.cinder.propose.translation.update.29\n"
+"Project-Id-Version: cinder jenkins.cinder.propose.translation.update.30\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -791,11 +791,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -943,12 +938,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -967,7 +962,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1001,7 +996,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1012,12 +1007,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1050,11 +1045,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1134,28 +1129,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1908,25 +1903,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2065,6 +2060,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2761,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2961,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3043,125 +3048,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""

diff --git a/cinder/locale/cs/LC_MESSAGES/cinder.po b/cinder/locale/cs/LC_MESSAGES/cinder.po
index d0b127b8751c67688651dc9c112876ecfcbeae7c..517d06af75f3573a1a9ecf85b49fb4497d0e18ee 100644 (file)
--- a/cinder/locale/cs/LC_MESSAGES/cinder.po
+++ b/cinder/locale/cs/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2012-04-04 20:28+0000\n"
 "Last-Translator: Zbyněk Schwarz <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -809,11 +809,6 @@ msgstr "timefunc: '%(name)s' trvalo %(total_time).2f sek"
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -961,12 +956,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "Nelze načít rozšížení %(ext_factory)s: %(exc)s"
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "Nelze načíst rozšíření %(classpath)s: %(exc)s"
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr "Nelze načíst rozšíření %(ext_name)s: %(exc)s"
@@ -985,7 +980,7 @@ msgstr "prvek není podřazený"
 msgid "root element selecting a list"
 msgstr "kořenový prvek volí seznam"
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1021,7 +1016,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1032,12 +1027,12 @@ msgstr "Nsprávný formát těla požadavku"
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1071,11 +1066,11 @@ msgstr "Neplatné nastavení aktualizace: '%s'"
 msgid "Setting host %(host)s to %(state)s."
 msgstr "Nastavování hostitele %(host)s na %(state)s."
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr "Describe-resource je funkce pouze pro správce"
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1156,28 +1151,28 @@ msgstr "%(url)s vrácena s HTTP %(status)d"
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr "Musí být určena třída ExtensionManager"
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr "Rozšířený zdroj: %s"
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr "Rozšíření %(ext_name)s: nelze rozšířit %(collection)s: Žádný takový zdroj"
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr "Rozšíření %(ext_name)s: rozšiřování zdroje %(collection)s"
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1939,25 +1934,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2098,6 +2093,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2799,7 +2804,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -3002,7 +3007,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3084,125 +3089,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Zachycena chyba: %s"
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr "Nenalezeno žádné cílové id ve svazku %(volume_id)s."
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, fuzzy, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr "Připojit svazek %(volume_id)s k instanci %(instance_id)s na %(device)s"
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5924,6 +5929,3 @@ msgstr "skupina %s již existuje"
 msgid "Unexpected state while cloning %s"
 msgstr "Při spuštění příkazu došlo k nečekané chybě."
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr "Úplná sada PŘÍZNAKŮ:"
-

diff --git a/cinder/locale/da/LC_MESSAGES/cinder.po b/cinder/locale/da/LC_MESSAGES/cinder.po
index d2ebfec2a8503c853c5635122ba29925731be6bd..48c887000cffe96f50f1e6deced665fb5da2a1c9 100644 (file)
--- a/cinder/locale/da/LC_MESSAGES/cinder.po
+++ b/cinder/locale/da/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2011-01-15 21:46+0000\n"
 "Last-Translator: Soren Hansen <soren@linux2go.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -791,11 +791,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -943,12 +938,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -967,7 +962,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1001,7 +996,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1012,12 +1007,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1050,11 +1045,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1134,28 +1129,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1908,25 +1903,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2065,6 +2060,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2761,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2961,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3043,125 +3048,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "bind %s: slettet"
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5866,6 +5871,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/de/LC_MESSAGES/cinder.po b/cinder/locale/de/LC_MESSAGES/cinder.po
index 2b9cd3dd7460353e5e22092c3895c4db25dbc216..5755c37a4e668b5346f8e4952b4b27e8835d1b95 100644 (file)
--- a/cinder/locale/de/LC_MESSAGES/cinder.po
+++ b/cinder/locale/de/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2011-08-23 11:23+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: German <de@li.org>\n"
@@ -797,11 +797,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -949,12 +944,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -973,7 +968,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1007,7 +1002,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1018,12 +1013,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1056,11 +1051,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1140,28 +1135,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1915,25 +1910,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2072,6 +2067,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2768,7 +2773,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2968,7 +2973,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3050,125 +3055,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr "Volume %s: erstelle Export"
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, fuzzy, python-format
 msgid "volume %s: create failed"
 msgstr "Volume %s: wird erstellt"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "Volume %s: erfolgreich erstellt"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr "Volume %s: wird entfernt"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr "Volume %s: entferne Export"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "Volume %s: erfolgreich entfernt"
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5878,6 +5883,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr "Unerwarteter Fehler bei Ausführung des Kommandos."
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr "Alle vorhandenen FLAGS:"
-

diff --git a/cinder/locale/en_AU/LC_MESSAGES/cinder.po b/cinder/locale/en_AU/LC_MESSAGES/cinder.po
index 80b76fa911f5a1566937d42f725e334ace6b2980..ac8ae61f82a79a2a8288bd6ada3e4ea41ea6ef31 100644 (file)
--- a/cinder/locale/en_AU/LC_MESSAGES/cinder.po
+++ b/cinder/locale/en_AU/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2011-10-21 11:27+0000\n"
 "Last-Translator: Tom Fifield <Unknown>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
@@ -798,11 +798,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
@@ -950,12 +945,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -974,7 +969,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1008,7 +1003,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1019,12 +1014,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1057,11 +1052,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1141,28 +1136,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1922,25 +1917,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2080,6 +2075,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2779,7 +2784,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2983,7 +2988,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3065,126 +3070,126 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr "volume %s: creating export"
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, fuzzy, python-format
 msgid "volume %s: create failed"
 msgstr "volume %s: creating"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: created successfully"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Caught error: %s"
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: deleting"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 #, fuzzy
 msgid "volume is not local to this node"
 msgstr "Volume is not local to this node"
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: removing export"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: deleted successfully"
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr "Tried to remove non-existent console %(console_id)s."
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, fuzzy, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5900,6 +5905,3 @@ msgstr "group %s already exists"
 msgid "Unexpected state while cloning %s"
 msgstr "Unexpected error while running command."
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/en_GB/LC_MESSAGES/cinder.po b/cinder/locale/en_GB/LC_MESSAGES/cinder.po
index 461738652b20c5546ea9bcb48a4944424e314565..34a2e47c3b327c1950abe4e9f74fb09207c8fd2e 100644 (file)
--- a/cinder/locale/en_GB/LC_MESSAGES/cinder.po
+++ b/cinder/locale/en_GB/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2012-03-30 11:10+0000\n"
 "Last-Translator: Anthony Harrington <untaintableangel@hotmail.co.uk>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -803,11 +803,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
@@ -955,12 +950,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -979,7 +974,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1013,7 +1008,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1024,12 +1019,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1062,11 +1057,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1146,28 +1141,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1926,25 +1921,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2083,6 +2078,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2783,7 +2788,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2987,7 +2992,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3069,126 +3074,126 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr "volume %s: creating export"
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, fuzzy, python-format
 msgid "volume %s: create failed"
 msgstr "volume %s: creating"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: created successfully"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: deleting"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 #, fuzzy
 msgid "volume is not local to this node"
 msgstr "Volume is not local to this node"
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: removing export"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: deleted successfully"
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5900,6 +5905,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr "Unexpected error while running command."
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr "Full set of FLAGS:"
-

diff --git a/cinder/locale/en_US/LC_MESSAGES/cinder.po b/cinder/locale/en_US/LC_MESSAGES/cinder.po
index 9c07b1c9a61b34c17d468cb36d08f52e1e5f29b0..8cdef0e0f123ac810788412df6c9c82c5b15a3e8 100644 (file)
--- a/cinder/locale/en_US/LC_MESSAGES/cinder.po
+++ b/cinder/locale/en_US/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-05-08 11:44+0000\n"
 "Last-Translator: markmc <markmc@redhat.com>\n"
 "Language-Team: en_US <LL@li.org>\n"
@@ -806,11 +806,6 @@ msgstr "timefunc: '%(name)s' took %(total_time).2f secs"
 msgid "Could not remove tmpdir: %s"
 msgstr "Could not remove tmpdir: %s"
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr "Unknown byte multiplier: %s"
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -962,12 +957,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "Failed to load extension %(ext_factory)s: %(exc)s"
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "Failed to load extension %(classpath)s: %(exc)s"
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr "Failed to load extension %(ext_name)s: %(exc)s"
@@ -986,7 +981,7 @@ msgstr "element is not a child"
 msgid "root element selecting a list"
 msgstr "root element selecting a list"
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
@@ -1020,7 +1015,7 @@ msgstr "Delete backup with id: %s"
 msgid "Creating new backup %s"
 msgstr "Creating new backup %s"
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1031,12 +1026,12 @@ msgstr "Incorrect request body format"
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr "Creating backup of volume %(volume_id)s in container %(container)s"
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr "Restoring backup %(backup_id)s (%(body)s)"
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr "Restoring backup %(backup_id)s to volume %(volume_id)s"
@@ -1069,11 +1064,11 @@ msgstr "Invalid update setting: '%s'"
 msgid "Setting host %(host)s to %(state)s."
 msgstr "Setting host %(host)s to %(state)s."
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr "Describe-resource is admin only functionality"
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr "Host not found"
 
@@ -1154,16 +1149,16 @@ msgstr "%(url)s returned with HTTP %(status)d"
 msgid "Request is too large."
 msgstr "Request is too large."
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr "Must specify an ExtensionManager class"
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr "Extended resource: %s"
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
@@ -1172,12 +1167,12 @@ msgstr ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr "Extension %(ext_name)s extending resource: %(collection)s"
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1982,25 +1977,25 @@ msgstr ""
 "Error contacting glance server '%(host)s:%(port)s' for '%(method)s', "
 "%(extra)s."
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr "Snapshot list encountered but no header found!"
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr "'qemu-img info' parsing failed."
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr "fmt=%(fmt)s backed by:%(backing_file)s"
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr "Converted to raw, but format is now %s"
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr "Converted to %(f1)s, but format is now %(f2)s"
@@ -2141,6 +2136,16 @@ msgstr "Child %(pid)s exited with status %(code)d"
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr "Unknown byte multiplier: %s"
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr "Invalid Parameter: Unicode is not supported by the current database."
@@ -2870,7 +2875,7 @@ msgid "Volume in unexpected state"
 msgstr "Unexpected status code"
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr "status must be available"
 
@@ -3078,7 +3083,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3160,125 +3165,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr "volume %s: creating export"
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr "volume %s: create failed"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: created successfully"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr "Error: %s"
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr "volume %s: Error trying to reschedule create"
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr "Retry info not present, will not reschedule"
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr "No request spec, will not reschedule"
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: deleting"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr "volume is not local to this node"
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: removing export"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr "Failed to update usages deleting volume"
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: deleted successfully"
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr "snapshot %s: creating"
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr "snapshot %(snap_name)s: creating"
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr "snapshot %s: created successfully"
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr "snapshot %s: deleting"
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr "Failed to update usages deleting snapshot"
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr "snapshot %s: deleted successfully"
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr "being attached by another instance"
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr "Failed to copy image to volume"
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, fuzzy, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr "Downloaded image %(image_id)s to %(volume_id)s successfully"
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr "Clear capabilities"
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr "Notification {%s} received"
@@ -6275,6 +6280,3 @@ msgstr "Volume (%s) already exists on array"
 msgid "Unexpected state while cloning %s"
 msgstr "Unexpected state while cloning %s"
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr "Full set of FLAGS:"
-

diff --git a/cinder/locale/es/LC_MESSAGES/cinder.po b/cinder/locale/es/LC_MESSAGES/cinder.po
index f7287e907f1db664cf707edb16500c1f3d9e6245..bb2e332da55d47e2e3d6cab09e41cc9650dee2c8 100644 (file)
--- a/cinder/locale/es/LC_MESSAGES/cinder.po
+++ b/cinder/locale/es/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2012-03-10 06:08+0000\n"
 "Last-Translator: Oscar Rosario <oscar.inirio@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -805,11 +805,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
@@ -957,12 +952,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -981,7 +976,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1015,7 +1010,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1026,12 +1021,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1064,11 +1059,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1148,28 +1143,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1929,25 +1924,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2087,6 +2082,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2789,7 +2794,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2993,7 +2998,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3075,126 +3080,126 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr "volumen %s: exportando"
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, fuzzy, python-format
 msgid "volume %s: create failed"
 msgstr "volumen %s: creando"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volumen %s: creado satisfactoriamente"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Capturado error: %s"
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volumen %s: eliminando"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 #, fuzzy
 msgid "volume is not local to this node"
 msgstr "Volumen no local a este nodo"
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volumen %s: eliminando exportación"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volumen %s: eliminado satisfactoriamente"
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr "Fallo al generar metadatos para la ip %s"
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5910,6 +5915,3 @@ msgstr "el grupo %s ya existe"
 msgid "Unexpected state while cloning %s"
 msgstr "Error inesperado mientras el comando se ejecutaba"
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr "Conjunto completo de opciones (FLAGS):"
-

diff --git a/cinder/locale/fi_FI/LC_MESSAGES/cinder.po b/cinder/locale/fi_FI/LC_MESSAGES/cinder.po
index 963d0988e0233777f6a0e69da8bc37619eae83d7..ea167835cdc4b8fcc519f18893234bdf51ffe699 100644 (file)
--- a/cinder/locale/fi_FI/LC_MESSAGES/cinder.po
+++ b/cinder/locale/fi_FI/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-05-08 11:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish (Finland) "
@@ -792,11 +792,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -944,12 +939,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -968,7 +963,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1002,7 +997,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1013,12 +1008,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1051,11 +1046,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1135,28 +1130,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1909,25 +1904,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2066,6 +2061,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2762,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2962,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3044,125 +3049,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5867,6 +5872,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/fr/LC_MESSAGES/cinder.po b/cinder/locale/fr/LC_MESSAGES/cinder.po
index c588f5ca1a94810a2b16a2557666bd14796e0794..3170db8ae86b1a2cf993fb65e4536090a2372b43 100644 (file)
--- a/cinder/locale/fr/LC_MESSAGES/cinder.po
+++ b/cinder/locale/fr/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2012-04-06 14:54+0000\n"
 "Last-Translator: EmmanuelLeNormand <manu@ubuntu-fr.org>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -805,11 +805,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
@@ -957,12 +952,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -981,7 +976,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1015,7 +1010,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1026,12 +1021,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1064,11 +1059,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1148,28 +1143,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1929,25 +1924,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2087,6 +2082,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2789,7 +2794,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2993,7 +2998,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3075,128 +3080,128 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr "volume %s: exportation en cours"
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, fuzzy, python-format
 msgid "volume %s: create failed"
 msgstr "volume %s: création"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: crée avec succès"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: suppression"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 #, fuzzy
 msgid "volume is not local to this node"
 msgstr "Le volume n'est pas local à ce noeud"
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: suppression de l'exportation"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: supprimé avec succès"
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr "Tentative de suppression d'une console non existente %(console_id)s."
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, fuzzy, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 "Montage du volume %(volume_id)s sur l'instance %(instance_id)s en tant "
 "que %(device)s"
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5916,6 +5921,3 @@ msgstr "le groupe %s existe déjà"
 msgid "Unexpected state while cloning %s"
 msgstr "Erreur imprévue lors de l'éxecution de la commande"
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr "Ensemble de propriétés complet :"
-

diff --git a/cinder/locale/hr/LC_MESSAGES/cinder.po b/cinder/locale/hr/LC_MESSAGES/cinder.po
index f255264ca07ebf2bfa1778867d7d654de780d516..14548f2390e26f47e2314c451b1d517594d203a4 100644 (file)
--- a/cinder/locale/hr/LC_MESSAGES/cinder.po
+++ b/cinder/locale/hr/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Croatian "
@@ -793,11 +793,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -945,12 +940,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -969,7 +964,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1003,7 +998,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1014,12 +1009,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1052,11 +1047,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1136,28 +1131,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1910,25 +1905,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2067,6 +2062,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2763,7 +2768,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2963,7 +2968,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3045,125 +3050,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5868,6 +5873,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/hu/LC_MESSAGES/cinder.po b/cinder/locale/hu/LC_MESSAGES/cinder.po
index 088fbc953071c3aef55e90d0d04f9381ec08b3f3..e99fe7dae32ba34df4dc6a787aa6f4518305ec88 100644 (file)
--- a/cinder/locale/hu/LC_MESSAGES/cinder.po
+++ b/cinder/locale/hu/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Hungarian "
@@ -792,11 +792,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -944,12 +939,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -968,7 +963,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1002,7 +997,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1013,12 +1008,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1051,11 +1046,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1135,28 +1130,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1909,25 +1904,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2066,6 +2061,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2762,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2962,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3044,125 +3049,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5867,6 +5872,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/id/LC_MESSAGES/cinder.po b/cinder/locale/id/LC_MESSAGES/cinder.po
index 487d8a5c9a6b88b2f0b4947bbc8e83f2b27d8ac3..1e477ba86ef5e86f16f053b1c6c8c665a3abbee2 100644 (file)
--- a/cinder/locale/id/LC_MESSAGES/cinder.po
+++ b/cinder/locale/id/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Indonesian "
@@ -792,11 +792,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -944,12 +939,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -968,7 +963,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1002,7 +997,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1013,12 +1008,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1051,11 +1046,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1135,28 +1130,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1909,25 +1904,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2066,6 +2061,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2762,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2962,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3044,125 +3049,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5867,6 +5872,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/it/LC_MESSAGES/cinder.po b/cinder/locale/it/LC_MESSAGES/cinder.po
index c6c3e74bb720a96a037d267a9635905c4ceacf48..338ea04501a28d38c773402b33991352e005b5eb 100644 (file)
--- a/cinder/locale/it/LC_MESSAGES/cinder.po
+++ b/cinder/locale/it/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2012-04-01 18:59+0000\n"
 "Last-Translator: simone.sandri <lexluxsox@hotmail.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -802,11 +802,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -954,12 +949,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -978,7 +973,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1012,7 +1007,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1023,12 +1018,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1061,11 +1056,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1145,28 +1140,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1925,25 +1920,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2082,6 +2077,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2781,7 +2786,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2985,7 +2990,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3067,126 +3072,126 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr "volume %s: creazione in corso per l'esportazione"
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, fuzzy, python-format
 msgid "volume %s: create failed"
 msgstr "volume %s: creazione in corso"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: creato con successo"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: rimuovendo"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 #, fuzzy
 msgid "volume is not local to this node"
 msgstr "Volume ancora collegato"
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: rimosso con successo"
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5900,6 +5905,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr "Si e' verificato un errore inatteso durante l'esecuzione del comando."
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr "Insieme di FLAGS:"
-

diff --git a/cinder/locale/it_IT/LC_MESSAGES/cinder.po b/cinder/locale/it_IT/LC_MESSAGES/cinder.po
index 7e831a8779054537eec141954441048e720000c9..0577138740313058ac0b42cc9f52406efb9e2a78 100644 (file)
--- a/cinder/locale/it_IT/LC_MESSAGES/cinder.po
+++ b/cinder/locale/it_IT/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian (Italy) "
@@ -792,11 +792,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -944,12 +939,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -968,7 +963,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1002,7 +997,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1013,12 +1008,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1051,11 +1046,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1135,28 +1130,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1909,25 +1904,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2066,6 +2061,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2762,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2962,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3044,125 +3049,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5867,6 +5872,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/ja/LC_MESSAGES/cinder.po b/cinder/locale/ja/LC_MESSAGES/cinder.po
index 467cd3bdaf1ddfc5fe73a8d82b80f939cc42b972..a1fba0cf5e1d8124c3e96b8c3093beeb5d0cbc93 100644 (file)
--- a/cinder/locale/ja/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ja/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2011-08-23 11:22+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: \n"
@@ -799,11 +799,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
@@ -951,12 +946,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -975,7 +970,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1009,7 +1004,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1020,12 +1015,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1058,11 +1053,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1142,28 +1137,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1923,25 +1918,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2081,6 +2076,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2780,7 +2785,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2984,7 +2989,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3066,126 +3071,126 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr "ボリューム %s をエクスポートします。"
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, fuzzy, python-format
 msgid "volume %s: create failed"
 msgstr "ボリューム%sを作成します。"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "ボリューム %s の作成に成功しました。"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "エラー %s をキャッチしました。"
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr "ボリューム %s を削除します。"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 #, fuzzy
 msgid "volume is not local to this node"
 msgstr "ボリュームはこのノードのローカルではありません。"
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr "ボリューム %s のエクスポートを解除します。"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "ボリューム %s の削除に成功しました。"
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr "存在しないコンソール %(console_id)s を削除しようとしました"
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, fuzzy, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr "ボリューム %(volume_id)s をインスタンス %(instance_id)s のデバイス %(device)s に接続"
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5901,6 +5906,3 @@ msgstr "グループ %s は既に存在しています。"
 msgid "Unexpected state while cloning %s"
 msgstr "コマンド実行において予期しないエラーが発生しました。"
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr "FLAGSの一覧:"
-

diff --git a/cinder/locale/ka_GE/LC_MESSAGES/cinder.po b/cinder/locale/ka_GE/LC_MESSAGES/cinder.po
index 976a628708a3d7b0164cd64025717fb748758799..b12cb4ada55b52a5fcbfc2a215031a6773149a62 100644 (file)
--- a/cinder/locale/ka_GE/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ka_GE/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Georgian (Georgia) "
@@ -792,11 +792,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -944,12 +939,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -968,7 +963,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1002,7 +997,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1013,12 +1008,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1051,11 +1046,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1135,28 +1130,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1909,25 +1904,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2066,6 +2061,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2762,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2962,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3044,125 +3049,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5867,6 +5872,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/ko/LC_MESSAGES/cinder.po b/cinder/locale/ko/LC_MESSAGES/cinder.po
index 4dc4db8a9909daab8393fe1b1e2d30f451bf8ba6..31a34dadc7cb797ef500fad06c8c7eb6fc055cc3 100644 (file)
--- a/cinder/locale/ko/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ko/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2011-12-16 04:42+0000\n"
 "Last-Translator: Zhongyue Luo <lzyeval@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -796,11 +796,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -948,12 +943,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -972,7 +967,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1006,7 +1001,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1017,12 +1012,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1055,11 +1050,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1139,28 +1134,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1919,25 +1914,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2076,6 +2071,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2772,7 +2777,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2976,7 +2981,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3058,125 +3063,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5887,6 +5892,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr "명령 실행도중 예측하지 못한 에러가 발생했습니다"
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/ko_KR/LC_MESSAGES/cinder.po b/cinder/locale/ko_KR/LC_MESSAGES/cinder.po
index ee7bb06ed25f1bb6a39fb1e7d95f361fc68ea6cd..4b1ff3dffd89b5721593baeaba1b16dffeae1aef 100644 (file)
--- a/cinder/locale/ko_KR/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ko_KR/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-05-08 11:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Korean (Korea) "
@@ -792,11 +792,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -944,12 +939,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -968,7 +963,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1002,7 +997,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1013,12 +1008,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1051,11 +1046,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1135,28 +1130,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1909,25 +1904,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2066,6 +2061,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2762,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2962,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3044,125 +3049,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5867,6 +5872,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/ms/LC_MESSAGES/cinder.po b/cinder/locale/ms/LC_MESSAGES/cinder.po
index 6fd5a7116b2186b08587e7f4ccde99d853a96fdb..736df9144dfe9d439020c5e993ac5fb18a9ab644 100644 (file)
--- a/cinder/locale/ms/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ms/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Malay "
@@ -792,11 +792,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -944,12 +939,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -968,7 +963,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1002,7 +997,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1013,12 +1008,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1051,11 +1046,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1135,28 +1130,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1909,25 +1904,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2066,6 +2061,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2762,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2962,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3044,125 +3049,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5867,6 +5872,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/nb/LC_MESSAGES/cinder.po b/cinder/locale/nb/LC_MESSAGES/cinder.po
index 52a5db84aca044d1357dc8f2db3057c3b9ce18f9..927be519b98cb174c6cf7b78350cb15996f22d65 100644 (file)
--- a/cinder/locale/nb/LC_MESSAGES/cinder.po
+++ b/cinder/locale/nb/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Norwegian Bokmål "
@@ -792,11 +792,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -944,12 +939,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -968,7 +963,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1002,7 +997,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1013,12 +1008,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1051,11 +1046,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1135,28 +1130,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1909,25 +1904,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2066,6 +2061,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2762,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2962,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3044,125 +3049,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5867,6 +5872,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/nl_NL/LC_MESSAGES/cinder.po b/cinder/locale/nl_NL/LC_MESSAGES/cinder.po
index 0fe06239351687b24cac3d33ec0f057878ac88ae..719a5ee8ebdd8acfa61971331fd714684c78c9c5 100644 (file)
--- a/cinder/locale/nl_NL/LC_MESSAGES/cinder.po
+++ b/cinder/locale/nl_NL/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Dutch (Netherlands) "
@@ -792,11 +792,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -944,12 +939,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -968,7 +963,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1002,7 +997,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1013,12 +1008,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1051,11 +1046,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1135,28 +1130,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1909,25 +1904,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2066,6 +2061,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2762,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2962,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3044,125 +3049,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5867,6 +5872,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/pt/LC_MESSAGES/cinder.po b/cinder/locale/pt/LC_MESSAGES/cinder.po
index 2cd7455f730332a9781920759c1122147537f1e1..d6dad71288f6739ffe5c3a58149ba3117e0d11f8 100644 (file)
--- a/cinder/locale/pt/LC_MESSAGES/cinder.po
+++ b/cinder/locale/pt/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese "
@@ -792,11 +792,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -944,12 +939,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -968,7 +963,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1002,7 +997,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1013,12 +1008,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1051,11 +1046,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1135,28 +1130,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1909,25 +1904,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2066,6 +2061,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2762,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2962,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3044,125 +3049,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5867,6 +5872,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/pt_BR/LC_MESSAGES/cinder.po b/cinder/locale/pt_BR/LC_MESSAGES/cinder.po
index 2dbfe2a7d85db081db619e94eb652cff27dbf076..0a7a33b069e7719c50ed4bb5b947f7a756becc7c 100644 (file)
--- a/cinder/locale/pt_BR/LC_MESSAGES/cinder.po
+++ b/cinder/locale/pt_BR/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2012-02-06 21:07+0000\n"
 "Last-Translator: Adriano Steffler <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -800,11 +800,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
@@ -952,12 +947,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -976,7 +971,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1010,7 +1005,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1021,12 +1016,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1059,11 +1054,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1143,28 +1138,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1923,25 +1918,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2080,6 +2075,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2778,7 +2783,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2982,7 +2987,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3064,126 +3069,126 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr "volume %s: criando o export"
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, fuzzy, python-format
 msgid "volume %s: create failed"
 msgstr "volume %s: criando"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: criado com sucesso"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Capturado o erro: %s"
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: removendo"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 #, fuzzy
 msgid "volume is not local to this node"
 msgstr "O volume não pertence à este node"
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: removendo export"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: remoção realizada com sucesso"
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr "Falha ao obter metadados para o ip: %s"
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5898,6 +5903,3 @@ msgstr "group %s já existe"
 msgid "Unexpected state while cloning %s"
 msgstr "Erro inesperado ao executar o comando."
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr "Conjunto completo de FLAGS:"
-

diff --git a/cinder/locale/ro/LC_MESSAGES/cinder.po b/cinder/locale/ro/LC_MESSAGES/cinder.po
index 22cea5b74200060c1529d4f6469f502c33f517b9..8c47b0eeb5f504eb49e7a2ed7b2cd140e2b3366a 100644 (file)
--- a/cinder/locale/ro/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ro/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-06-12 07:55+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Romanian "
@@ -793,11 +793,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -945,12 +940,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -969,7 +964,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1003,7 +998,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1014,12 +1009,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1052,11 +1047,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1136,28 +1131,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1910,25 +1905,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2067,6 +2062,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2763,7 +2768,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2963,7 +2968,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3045,125 +3050,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5868,6 +5873,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/ru/LC_MESSAGES/cinder.po b/cinder/locale/ru/LC_MESSAGES/cinder.po
index 7d885ef5e1b519e4e69af015b61ed61a79c84628..d81b53bc205669e5a88229140a317e37a8a19004 100644 (file)
--- a/cinder/locale/ru/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ru/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2012-03-25 09:34+0000\n"
 "Last-Translator: Eugene Marshal <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -810,11 +810,6 @@ msgstr "timefunc: '%(name)s' заняла %(total_time).2f с."
 msgid "Could not remove tmpdir: %s"
 msgstr "Ошибка удаления контейнера: %s"
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
@@ -962,12 +957,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "Ошибка загрузки расширения %(ext_factory)s: %(exc)s"
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr "Ошибка загрузки расширения %(ext_name)s: %(exc)s"
@@ -986,7 +981,7 @@ msgstr "элемент не является потомком"
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1020,7 +1015,7 @@ msgstr "Удалить снимок с идентификатором: %s"
 msgid "Creating new backup %s"
 msgstr "Создание SR %s"
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1031,12 +1026,12 @@ msgstr "Неправильный формат тела запроса"
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1070,11 +1065,11 @@ msgstr "Недопустимый параметр обновления: '%s'"
 msgid "Setting host %(host)s to %(state)s."
 msgstr "Перевод узла %(host)s в %(state)s."
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr "Узел не найден"
 
@@ -1156,16 +1151,16 @@ msgstr "%(url)s возвратил с HTTP %(status)d"
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr "Расширенный ресурс: %s"
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
@@ -1174,12 +1169,12 @@ msgstr ""
 "Расширение %(ext_name)s: Невозможно расширить ресурс %(collection)s: Нет "
 "такого ресурса"
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr "Расширение %(ext_name)s расширение ресурса: %(collection)s"
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1941,25 +1936,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr "Ошибка анализа 'qemu-img info'."
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr "Преобразование в необработанный, но текущий формат %s"
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, fuzzy, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr "Преобразование в необработанный, но текущий формат %s"
@@ -2099,6 +2094,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2815,7 +2820,7 @@ msgid "Volume in unexpected state"
 msgstr "Непредвиденный код состояния"
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -3020,7 +3025,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3103,127 +3108,127 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr "том %s: создание экспортирования"
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, fuzzy, python-format
 msgid "volume %s: create failed"
 msgstr "том %s: создание"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "том %s: создание завершено"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Ошибка БД: %s"
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr "том %s: удаление"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 #, fuzzy
 msgid "volume is not local to this node"
 msgstr "Том до сих пор присоединён"
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr "том %s: удаление экспортирования"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 #, fuzzy
 msgid "Failed to update usages deleting volume"
 msgstr "Ошибка обновления агента: %(resp)r"
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "том %s: удаление завершено"
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr "снимок %s: создание"
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr "снимок %(snap_name)s: создание"
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr "снимок %s: создание завершено"
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr "снимок %s: удаление"
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr "снимок %s: удаление выполнено"
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr "Выполнена попытка удаления несуществующей консоли %(console_id)s."
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, fuzzy, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr "Подключить том %(volume_id)s для копии %(instance_id)s на %(device)s"
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr "Очистить возможности"
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr "Принято уведомление {%s}"
@@ -5954,6 +5959,3 @@ msgstr "группа %s уже существует"
 msgid "Unexpected state while cloning %s"
 msgstr "Неожиданная ошибка при выполнении команды."
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr "Полный набор ФЛАГОВ:"
-

diff --git a/cinder/locale/ru_RU/LC_MESSAGES/cinder.po b/cinder/locale/ru_RU/LC_MESSAGES/cinder.po
index e0e72c39a5b95c113818a8351ca386360d406423..e97d8e9076884600af862c5d3ade048e52d0aa79 100644 (file)
--- a/cinder/locale/ru_RU/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ru_RU/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Russian (Russia) "
@@ -793,11 +793,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -945,12 +940,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -969,7 +964,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1003,7 +998,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1014,12 +1009,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1052,11 +1047,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1136,28 +1131,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1910,25 +1905,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2067,6 +2062,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2763,7 +2768,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2963,7 +2968,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3045,125 +3050,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5868,6 +5873,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/sw_KE/LC_MESSAGES/cinder.po b/cinder/locale/sw_KE/LC_MESSAGES/cinder.po
index cec66ad885a982ce240ec2fe4bf315a7f7c3ab42..c4f0717da69f83d9bd7fc09889b2b0223e98c17c 100644 (file)
--- a/cinder/locale/sw_KE/LC_MESSAGES/cinder.po
+++ b/cinder/locale/sw_KE/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Swahili (Kenya) "
@@ -792,11 +792,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -944,12 +939,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -968,7 +963,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1002,7 +997,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1013,12 +1008,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1051,11 +1046,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1135,28 +1130,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1909,25 +1904,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2066,6 +2061,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2762,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2962,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3044,125 +3049,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5867,6 +5872,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/tl/LC_MESSAGES/cinder.po b/cinder/locale/tl/LC_MESSAGES/cinder.po
index e7458da9b635e5ced98cc1d53c3f1fde82f24567..18c62676a5cc5699dbf9362fe1660d5dcff3b265 100644 (file)
--- a/cinder/locale/tl/LC_MESSAGES/cinder.po
+++ b/cinder/locale/tl/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2011-08-23 11:21+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: Tagalog <tl@li.org>\n"
@@ -791,11 +791,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -943,12 +938,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -967,7 +962,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1001,7 +996,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1012,12 +1007,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1050,11 +1045,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1134,28 +1129,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1908,25 +1903,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2065,6 +2060,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2761,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2961,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3043,125 +3048,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5868,6 +5873,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr "Merong hindi-inaasahang pagkakamali habang tumatakbo ang command."
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/tr/LC_MESSAGES/cinder.po b/cinder/locale/tr/LC_MESSAGES/cinder.po
index 2a8faf64cc5631c64ca1f34e6db4db86f1dd7723..f186393b5f87ab5a1131161c4dc2b96b2fcdb621 100644 (file)
--- a/cinder/locale/tr/LC_MESSAGES/cinder.po
+++ b/cinder/locale/tr/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2011-12-14 18:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -791,11 +791,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -943,12 +938,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -967,7 +962,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1001,7 +996,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1012,12 +1007,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1050,11 +1045,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1134,28 +1129,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1908,25 +1903,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2065,6 +2060,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2761,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2961,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3043,125 +3048,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5866,6 +5871,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/tr_TR/LC_MESSAGES/cinder.po b/cinder/locale/tr_TR/LC_MESSAGES/cinder.po
index 51898c940d33e9aae8a5f9d127ed3feeeaafb7d1..8fb9dfe0ae31804605009467ea0657e9b201bcdb 100644 (file)
--- a/cinder/locale/tr_TR/LC_MESSAGES/cinder.po
+++ b/cinder/locale/tr_TR/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Turkish (Turkey) "
@@ -792,11 +792,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -944,12 +939,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -968,7 +963,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1002,7 +997,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1013,12 +1008,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1051,11 +1046,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1135,28 +1130,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1909,25 +1904,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2066,6 +2061,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2762,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2962,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3044,125 +3049,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5867,6 +5872,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/uk/LC_MESSAGES/cinder.po b/cinder/locale/uk/LC_MESSAGES/cinder.po
index a0e8b45714f715f5c097342425e9bfb4effcc090..85ee449ab290a46d1cc6682505808f8a080ca243 100644 (file)
--- a/cinder/locale/uk/LC_MESSAGES/cinder.po
+++ b/cinder/locale/uk/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2011-08-23 11:21+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -792,11 +792,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -944,12 +939,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -968,7 +963,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1002,7 +997,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1013,12 +1008,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1051,11 +1046,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1135,28 +1130,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1909,25 +1904,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2066,6 +2061,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2762,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2962,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3044,125 +3049,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5869,6 +5874,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr "Неочікувана помилка при виконанні команди."
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/vi_VN/LC_MESSAGES/cinder.po b/cinder/locale/vi_VN/LC_MESSAGES/cinder.po
index c9b883e52347f4c3ef5c2c24a26086ceed684bc8..90c51ee0049aa03b4c0e37b64cfef6f46735c330 100644 (file)
--- a/cinder/locale/vi_VN/LC_MESSAGES/cinder.po
+++ b/cinder/locale/vi_VN/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-05-08 11:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese (Viet Nam) "
@@ -792,11 +792,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -944,12 +939,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -968,7 +963,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1002,7 +997,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1013,12 +1008,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1051,11 +1046,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1135,28 +1130,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1909,25 +1904,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2066,6 +2061,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2762,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2962,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3044,125 +3049,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5867,6 +5872,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/zh_CN/LC_MESSAGES/cinder.po b/cinder/locale/zh_CN/LC_MESSAGES/cinder.po
index 50c6ed392a5b6ed38f3646d1652c1eb605a69a18..4fa602000b7dc922337399e1c0e2728405d01f20 100644 (file)
--- a/cinder/locale/zh_CN/LC_MESSAGES/cinder.po
+++ b/cinder/locale/zh_CN/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2012-04-03 23:36+0000\n"
 "Last-Translator: cheesecake <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
@@ -805,11 +805,6 @@ msgstr "timefunc：'%(name)s' 用了%(total_time).2f 秒"
 msgid "Could not remove tmpdir: %s"
 msgstr "移除容器失败：%s"
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, fuzzy, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr "未知的基文件：%s"
-
 #: cinder/wsgi.py:121
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
@@ -957,12 +952,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "加载扩展 %(ext_factory)s 失败：%(exc)s"
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "加载扩展 %(classpath)s 失败：%(exc)s"
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr "加载扩展 %(ext_name)s 失败：%(exc)s"
@@ -981,7 +976,7 @@ msgstr "元素不是子节点"
 msgid "root element selecting a list"
 msgstr "根元素选择列表"
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr "模板数不匹配；把slave %(slavetag)s 添加到master %(mastertag)s"
@@ -1015,7 +1010,7 @@ msgstr "删除id为 %s 的快照"
 msgid "Creating new backup %s"
 msgstr "轮换出%d个备份"
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1026,12 +1021,12 @@ msgstr "不正确的请求主体格式"
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr "卷 %(volume_id)s 正在 %(mountpoint)s 上启动"
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1065,11 +1060,11 @@ msgstr "无效的更新设置：'%s'"
 msgid "Setting host %(host)s to %(state)s."
 msgstr "把主机 %(host)s 设置为 %(state)s。"
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr "Describe-resource是只有管理员才能执行的功能。"
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr "没有找到主机"
 
@@ -1151,28 +1146,28 @@ msgstr "%(url)s 随HTTP %(status)d返回"
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr "必须明确一个ExtensionManager类"
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr "扩展资源：%s"
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr "扩展%(ext_name)s：无法扩展资源 %(collection)s：没有那种资源"
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr "扩展资源的扩展 %(ext_name)s：%(collection)s"
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1939,25 +1934,25 @@ msgstr "dns_domains 表没有删除"
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr "'qemu-img info'解析失败"
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, fuzzy, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr "fmt=%(fmt)s 由 %(backing_file)s 支持"
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr "转化为裸格式，但目前格式是 %s"
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, fuzzy, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr "转化为裸格式，但目前格式是 %s"
@@ -2099,6 +2094,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, fuzzy, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr "未知的基文件：%s"
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2815,7 +2820,7 @@ msgid "Volume in unexpected state"
 msgstr "意外的状态码"
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr "状态必须可用"
 
@@ -3022,7 +3027,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3105,127 +3110,127 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr "卷%s：正在创建导出"
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, fuzzy, python-format
 msgid "volume %s: create failed"
 msgstr "卷 %s: 创建中"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "卷%s：创建成功"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "数据库错误：%s"
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr "卷%s：删除中"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 #, fuzzy
 msgid "volume is not local to this node"
 msgstr "卷不属于这个节点"
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr "卷%s：正在移除导出"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 #, fuzzy
 msgid "Failed to update usages deleting volume"
 msgstr "更新代理失败：%(resp)r"
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "卷%s：删除成功"
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr "快照 %s：正在创建"
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr "快照 %(snap_name)s：正在创建"
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr "快照 %s：创建成功"
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr "快照 %s：正在删除"
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr "快照 %s：删除成功"
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr "没有为卷 %(volume_id)s 找到目标id。"
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, fuzzy, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr "把卷 %(volume_id)s 附加到实例 %(instance_id)s 上位置在 %(device)s"
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr "清理能力"
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr "收到通知 {%s}"
@@ -5956,6 +5961,3 @@ msgstr "安全组 %s 已经存在"
 msgid "Unexpected state while cloning %s"
 msgstr "运行命令时出现意外错误"
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr "标记全集："
-

diff --git a/cinder/locale/zh_HK/LC_MESSAGES/cinder.po b/cinder/locale/zh_HK/LC_MESSAGES/cinder.po
index a9c1cd444f4717766c3569758599353694e544f2..83c6757e0279c8741f67140f758b3e77039f3267 100644 (file)
--- a/cinder/locale/zh_HK/LC_MESSAGES/cinder.po
+++ b/cinder/locale/zh_HK/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (Hong Kong) "
@@ -792,11 +792,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -944,12 +939,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -968,7 +963,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1002,7 +997,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1013,12 +1008,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1051,11 +1046,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1135,28 +1130,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1909,25 +1904,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2066,6 +2061,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2762,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2962,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3044,125 +3049,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5867,6 +5872,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-

diff --git a/cinder/locale/zh_TW/LC_MESSAGES/cinder.po b/cinder/locale/zh_TW/LC_MESSAGES/cinder.po
index 731d7d9e8f3625ec5176609c7b72c77efc1109a5..58e2765bdbec6b7155005df005b77230655dcea9 100644 (file)
--- a/cinder/locale/zh_TW/LC_MESSAGES/cinder.po
+++ b/cinder/locale/zh_TW/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-14 18:09+0000\n"
+"POT-Creation-Date: 2013-06-15 18:10+0000\n"
 "PO-Revision-Date: 2012-03-07 02:00+0000\n"
 "Last-Translator: Charles Hsu <charles0126+openstack@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
@@ -800,11 +800,6 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1159 cinder/openstack/common/strutils.py:186
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
 #: cinder/wsgi.py:121
 #, python-format
 msgid "Unable to find cert_file : %s"
@@ -952,12 +947,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:358
+#: cinder/api/extensions.py:359
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: cinder/api/extensions.py:382
+#: cinder/api/extensions.py:384
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -976,7 +971,7 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: cinder/api/xmlutil.py:742
+#: cinder/api/xmlutil.py:740
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
@@ -1010,7 +1005,7 @@ msgstr ""
 msgid "Creating new backup %s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:230
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:232
 #: cinder/api/contrib/volume_transfer.py:159
 #: cinder/api/contrib/volume_transfer.py:195
 msgid "Incorrect request body format"
@@ -1021,12 +1016,12 @@ msgstr ""
 msgid "Creating backup of volume %(volume_id)s in container %(container)s"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:221
+#: cinder/api/contrib/backups.py:222
 #, python-format
 msgid "Restoring backup %(backup_id)s (%(body)s)"
 msgstr ""
 
-#: cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/backups.py:236
 #, python-format
 msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
 msgstr ""
@@ -1059,11 +1054,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:205
+#: cinder/api/contrib/hosts.py:206
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: cinder/api/contrib/hosts.py:213
+#: cinder/api/contrib/hosts.py:214
 msgid "Host not found"
 msgstr ""
 
@@ -1143,28 +1138,28 @@ msgstr ""
 msgid "Request is too large."
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:74
+#: cinder/api/openstack/__init__.py:73
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:85
+#: cinder/api/openstack/__init__.py:84
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:110
+#: cinder/api/openstack/__init__.py:108
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:115
+#: cinder/api/openstack/__init__.py:114
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: cinder/api/openstack/__init__.py:128
+#: cinder/api/openstack/__init__.py:130
 msgid ""
 "cinder.api.openstack:FaultWrapper is deprecated. Please use "
 "cinder.api.middleware.fault:FaultWrapper instead."
@@ -1922,25 +1917,25 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:118
+#: cinder/image/image_utils.py:119
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: cinder/image/image_utils.py:232
+#: cinder/image/image_utils.py:233
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:239
+#: cinder/image/image_utils.py:240
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:256
+#: cinder/image/image_utils.py:257
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:287
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2079,6 +2074,16 @@ msgstr ""
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
 #: cinder/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
@@ -2777,7 +2782,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:103 cinder/volume/api.py:108 cinder/volume/api.py:482
-#: cinder/volume/manager.py:561
+#: cinder/volume/manager.py:567
 msgid "status must be available"
 msgstr ""
 
@@ -2981,7 +2986,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:719
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3063,125 +3068,125 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/manager.py:292
+#: cinder/volume/manager.py:294
 #, python-format
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:327
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:335
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:361
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:379
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:383
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:388
 #, python-format
 msgid "volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d"
 msgstr ""
 
-#: cinder/volume/manager.py:411 cinder/volume/manager.py:424
+#: cinder/volume/manager.py:417 cinder/volume/manager.py:430
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:423
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:428
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:433
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:453
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:451
+#: cinder/volume/manager.py:457
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:466
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:472
+#: cinder/volume/manager.py:478
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:490
+#: cinder/volume/manager.py:496
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
+#: cinder/volume/manager.py:504 cinder/volume/manager.py:514
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:511
+#: cinder/volume/manager.py:517
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:537
+#: cinder/volume/manager.py:543
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:540
+#: cinder/volume/manager.py:546
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:558
+#: cinder/volume/manager.py:564
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
+#: cinder/volume/manager.py:623 cinder/volume/manager.py:628
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:627
+#: cinder/volume/manager.py:633
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:652
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:726
+#: cinder/volume/manager.py:732
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:730
+#: cinder/volume/manager.py:736
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5893,6 +5898,3 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr "非預期的執行錯誤"
 
-#~ msgid "Full set of FLAGS:"
-#~ msgstr ""
-