Imported Translations from Transifex

Change-Id: Ic2b5d57ad16da67e9b152853338a2ef488eaeee7

diff --git a/cinder/locale/bg_BG/LC_MESSAGES/cinder.po b/cinder/locale/bg_BG/LC_MESSAGES/cinder.po
index b055d1eef6eec34fba4eb94636444c7aebbabfde..9ec19f77c0504588e622444cdfcf9303e9100a58 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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) "
@@ -137,7 +137,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -711,7 +712,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -721,7 +722,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -847,11 +848,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1263,11 +1264,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1277,7 +1278,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1765,22 +1766,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1835,7 +1836,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2666,8 +2667,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2718,68 +2719,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2829,7 +2830,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2916,120 +2917,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3285,28 +3286,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3491,7 +3492,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5578,17 +5579,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5612,7 +5613,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5622,23 +5623,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/bs/LC_MESSAGES/cinder.po b/cinder/locale/bs/LC_MESSAGES/cinder.po
index 384fd842d200946ebe7261e695142b3494a68a06..d3788f0dabea8b2a6047655533b486095544b720 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -136,7 +136,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -710,7 +711,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -720,7 +721,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -846,11 +847,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1262,11 +1263,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1276,7 +1277,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1768,22 +1769,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1838,7 +1839,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2669,8 +2670,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2722,71 +2723,71 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr "Status volumena mora biti omogućen"
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 #, fuzzy
 msgid "Volume status must be available to reserve"
 msgstr "Status volumena mora biti omogućen"
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 #, fuzzy
 msgid "Volume Snapshot status must be available or error"
 msgstr "Status volumena mora biti omogućen"
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 #, fuzzy
 msgid "Volume status must be available/in-use."
 msgstr "Status volumena mora biti omogućen"
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2836,7 +2837,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2923,120 +2924,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3292,28 +3293,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3498,7 +3499,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5585,17 +5586,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, fuzzy, python-format
 msgid "Error running ssh command: %s"
 msgstr "Neočekivana greška prilikom pokretanja komande."
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5619,7 +5620,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, fuzzy, python-format
 msgid "Unexpected state while cloning %s"
 msgstr "Neočekivana greška prilikom pokretanja komande."
@@ -5629,23 +5630,12 @@ msgstr "Neočekivana greška prilikom pokretanja komande."
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/ca/LC_MESSAGES/cinder.po b/cinder/locale/ca/LC_MESSAGES/cinder.po
index 71d3664b2d6fda71a4de1da62473685136155217..30c7706693fe8b84442a89eb5788c995fdee926c 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Catalan "
@@ -137,7 +137,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -711,7 +712,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -721,7 +722,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -847,11 +848,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1263,11 +1264,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1277,7 +1278,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1765,22 +1766,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1835,7 +1836,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2666,8 +2667,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2718,68 +2719,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2829,7 +2830,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2916,120 +2917,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3285,28 +3286,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3491,7 +3492,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5578,17 +5579,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5612,7 +5613,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5622,9 +5623,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
+#~ msgid "Expected a uuid but received %(uuid)."
+#~ msgstr ""
+
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
+#~ msgstr ""
+
+#~ msgid "The hostname must be called '%s'"
+#~ msgstr ""
 

diff --git a/cinder/locale/cinder.pot b/cinder/locale/cinder.pot
index 903f5337ee1316cc076a98c4ad451985aa00ddc6..9adcb490e6625d8f4c6dbf807c63efa4f391f86b 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.13\n"
+"Project-Id-Version: cinder jenkins.cinder.propose.translation.update.15\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -136,7 +136,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -710,7 +711,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -720,7 +721,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -846,11 +847,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1262,11 +1263,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1276,7 +1277,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1764,22 +1765,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1834,7 +1835,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2665,8 +2666,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2717,68 +2718,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2828,7 +2829,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2915,120 +2916,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3284,28 +3285,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3490,7 +3491,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5577,17 +5578,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5611,7 +5612,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5621,9 +5622,3 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-

diff --git a/cinder/locale/cs/LC_MESSAGES/cinder.po b/cinder/locale/cs/LC_MESSAGES/cinder.po
index c1aa5e0d5be8b8ddfe7d2bedf69c9d0e207278d4..b671c7cff0d9f7aca016e61f0e4ddbce916a6cbb 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -143,7 +143,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "Obraz %(image_id)s je nepřijatelný: %(reason)s"
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -728,7 +729,7 @@ msgstr "Spouštění příkazu (podproces): %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr "Výsledek byl %s"
@@ -738,7 +739,7 @@ msgstr "Výsledek byl %s"
 msgid "%r failed. Retrying."
 msgstr "%r selhalo. Opakování."
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Spouštění příkazu (SSH): %s"
@@ -864,11 +865,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr "parametr limit musí být celé číslo"
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr "parametr limit musí být kladný"
 
@@ -1288,11 +1289,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr "Zadáno neplatné imageRef."
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Vytvořit svazek o %s GB"
@@ -1302,7 +1303,7 @@ msgstr "Vytvořit svazek o %s GB"
 msgid "Removing options '%(bad_options)s' from query"
 msgstr "Odstraňování voleb '%(unk_opt_str)s' z fronty"
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, fuzzy, python-format
 msgid "Removing options '%s' from query"
 msgstr "Odstraňování voleb '%(unk_opt_str)s' z fronty"
@@ -1794,22 +1795,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1864,7 +1865,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2703,8 +2704,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2756,70 +2757,70 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr "Obraz musí být dostupný"
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 #, fuzzy
 msgid "Volume status must be available to reserve"
 msgstr "Obraz musí být dostupný"
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 #, fuzzy
 msgid "Volume status must be available/in-use."
 msgstr "Obraz musí být dostupný"
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2869,7 +2870,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2956,120 +2957,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Zachycena chyba: %s"
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, 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:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, 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:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3326,29 +3327,29 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 #, fuzzy
 msgid "Not an rbd snapshot"
 msgstr "Neplatný snímek"
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3535,7 +3536,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5635,17 +5636,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, fuzzy, python-format
 msgid "Error running ssh command: %s"
 msgstr "Při spuštění příkazu došlo k nečekané chybě."
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5669,7 +5670,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr "skupina %s již existuje"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, fuzzy, python-format
 msgid "Unexpected state while cloning %s"
 msgstr "Při spuštění příkazu došlo k nečekané chybě."
@@ -5679,23 +5680,12 @@ msgstr "Při spuštění příkazu došlo k nečekané chybě."
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/da/LC_MESSAGES/cinder.po b/cinder/locale/da/LC_MESSAGES/cinder.po
index 7592bd317a8f04129f1e440bdf331f9984379cff..15a8d876b0eb067eec1dcbc492c996115b9c34e0 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -136,7 +136,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -710,7 +711,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -720,7 +721,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -846,11 +847,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1262,11 +1263,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1276,7 +1277,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1764,22 +1765,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1834,7 +1835,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2665,8 +2666,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2717,68 +2718,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2828,7 +2829,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2915,120 +2916,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "bind %s: slettet"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3284,28 +3285,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3490,7 +3491,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5577,17 +5578,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5611,7 +5612,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5621,23 +5622,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/de/LC_MESSAGES/cinder.po b/cinder/locale/de/LC_MESSAGES/cinder.po
index 2b928887ae650adb9075ebeb80feb0c0b7c23dec..9ea199c8bf03febc2e329de5327f583ec12b4c40 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -141,7 +141,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -715,7 +716,7 @@ msgstr "Führe Kommando (subprocess) aus: %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr "Ergebnis war %s"
@@ -725,7 +726,7 @@ msgstr "Ergebnis war %s"
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -851,11 +852,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1267,11 +1268,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1281,7 +1282,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1769,22 +1770,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1839,7 +1840,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2671,8 +2672,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2723,68 +2724,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2834,7 +2835,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2921,120 +2922,120 @@ msgstr "Volume %s: erstelle Export"
 msgid "volume %s: create failed"
 msgstr "Volume %s: wird erstellt"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "Volume %s: erfolgreich erstellt"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr "Volume %s: wird entfernt"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr "Volume %s: entferne Export"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "Volume %s: erfolgreich entfernt"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3290,28 +3291,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, fuzzy, python-format
 msgid "Unable to read image %s"
 msgstr "Nicht möglich volume %s zufinden"
@@ -3496,7 +3497,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5588,17 +5589,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, fuzzy, python-format
 msgid "Error running ssh command: %s"
 msgstr "Unerwarteter Fehler bei Ausführung des Kommandos."
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5622,7 +5623,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, fuzzy, python-format
 msgid "Unexpected state while cloning %s"
 msgstr "Unerwarteter Fehler bei Ausführung des Kommandos."
@@ -5632,23 +5633,12 @@ msgstr "Unerwarteter Fehler bei Ausführung des Kommandos."
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/en_AU/LC_MESSAGES/cinder.po b/cinder/locale/en_AU/LC_MESSAGES/cinder.po
index 0c651b022041f03f5b9b2e956d1afd7e3af090fb..9d11140cd27d99d744fe113ea98cad72fc6c2caa 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -141,7 +141,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -717,7 +718,7 @@ msgstr "Running cmd (subprocess): %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr "Result was %s"
@@ -727,7 +728,7 @@ msgstr "Result was %s"
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Running cmd (SSH): %s"
@@ -853,11 +854,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1271,11 +1272,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Create volume of %s GB"
@@ -1285,7 +1286,7 @@ msgstr "Create volume of %s GB"
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1777,22 +1778,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1847,7 +1848,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2682,8 +2683,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2735,71 +2736,71 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr "Volume status must be available"
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 #, fuzzy
 msgid "Volume status must be available to reserve"
 msgstr "Volume status must be available"
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 #, fuzzy
 msgid "Volume Snapshot status must be available or error"
 msgstr "Volume status must be available"
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 #, fuzzy
 msgid "Volume status must be available/in-use."
 msgstr "Volume status must be available"
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2849,7 +2850,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2936,121 +2937,121 @@ msgstr "volume %s: creating export"
 msgid "volume %s: create failed"
 msgstr "volume %s: creating"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: created successfully"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Caught error: %s"
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: deleting"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 #, 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:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: removing export"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: deleted successfully"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instance %s: snapshotting"
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, 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:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, 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:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3306,29 +3307,29 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr "rbd has no pool %s"
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 #, fuzzy
 msgid "Not an rbd snapshot"
 msgstr "instance %s: snapshotting"
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, fuzzy, python-format
 msgid "Unable to read image %s"
 msgstr "Unable to locate volume %s"
@@ -3515,7 +3516,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5609,17 +5610,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, fuzzy, python-format
 msgid "Error running ssh command: %s"
 msgstr "Unexpected error while running command."
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5643,7 +5644,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr "group %s already exists"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, fuzzy, python-format
 msgid "Unexpected state while cloning %s"
 msgstr "Unexpected error while running command."
@@ -5653,23 +5654,12 @@ msgstr "Unexpected error while running command."
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/en_GB/LC_MESSAGES/cinder.po b/cinder/locale/en_GB/LC_MESSAGES/cinder.po
index 0bd1833ef766a9e94c7a6783a7e441725ff73eee..c90ae39c132eeed470aa0c5dec2e715bfcc96376 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -142,7 +142,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -720,7 +721,7 @@ msgstr "Running cmd (subprocess): %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr "Result was %s"
@@ -730,7 +731,7 @@ msgstr "Result was %s"
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Running cmd (SSH): %s"
@@ -856,11 +857,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1273,11 +1274,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1287,7 +1288,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1779,22 +1780,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1849,7 +1850,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2685,8 +2686,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2738,71 +2739,71 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr "Volume status must be available"
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 #, fuzzy
 msgid "Volume status must be available to reserve"
 msgstr "Volume status must be available"
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 #, fuzzy
 msgid "Volume Snapshot status must be available or error"
 msgstr "Volume status must be available"
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 #, fuzzy
 msgid "Volume status must be available/in-use."
 msgstr "Volume status must be available"
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2852,7 +2853,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2939,121 +2940,121 @@ msgstr "volume %s: creating export"
 msgid "volume %s: create failed"
 msgstr "volume %s: creating"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: created successfully"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: deleting"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 #, 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:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: removing export"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: deleted successfully"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instance %s: snapshotting"
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3309,29 +3310,29 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 #, fuzzy
 msgid "Not an rbd snapshot"
 msgstr "Invalid snapshot"
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, fuzzy, python-format
 msgid "Unable to read image %s"
 msgstr "Unable to locate volume %s"
@@ -3517,7 +3518,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5609,17 +5610,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, fuzzy, python-format
 msgid "Error running ssh command: %s"
 msgstr "Unexpected error while running command."
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5643,7 +5644,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, fuzzy, python-format
 msgid "Unexpected state while cloning %s"
 msgstr "Unexpected error while running command."
@@ -5653,23 +5654,12 @@ msgstr "Unexpected error while running command."
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/en_US/LC_MESSAGES/cinder.po b/cinder/locale/en_US/LC_MESSAGES/cinder.po
index e4f9ad342dd6fc2fced60fc51d980e177e064460..293eefc738d0169cd649eca79672c873a68569d0 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -141,7 +141,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "Image %(image_id)s is unacceptable: %(reason)s"
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, fuzzy, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr "Expected a uuid but received %(uuid)."
 
 #: cinder/exception.py:223
@@ -724,7 +725,7 @@ msgstr "Running cmd (subprocess): %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr "Result was %s"
@@ -734,7 +735,7 @@ msgstr "Result was %s"
 msgid "%r failed. Retrying."
 msgstr "%r failed. Retrying."
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Running cmd (SSH): %s"
@@ -862,11 +863,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr "limit param must be an integer"
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr "limit param must be positive"
 
@@ -1284,11 +1285,11 @@ msgid "Delete volume with id: %s"
 msgstr "Delete volume with id: %s"
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr "Invalid imageRef provided."
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Create volume of %s GB"
@@ -1298,7 +1299,7 @@ msgstr "Create volume of %s GB"
 msgid "Removing options '%(bad_options)s' from query"
 msgstr "Removing options '%(bad_options)s' from query"
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr "Removing options '%s' from query"
@@ -1831,22 +1832,22 @@ msgstr "Unrecognized read_deleted value '%s'"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr "Change will make usage less than 0 for the following resources: %(unders)s"
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr "No backend config with id %(sm_backend_id)s"
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr "No sm_flavor called %(sm_flavor)s"
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr "No sm_volume with id %(volume_id)s"
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr "No backup with id %(backup_id)s"
@@ -1901,7 +1902,8 @@ msgid "reservations table not dropped"
 msgstr "reservations table not dropped"
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+#, fuzzy
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr "Exception while creating table 'volume_glance_metedata'"
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2768,8 +2770,8 @@ msgstr "Decoding JSON: %s"
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr "May specify only one of snapshot, imageRef or source volume"
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr "status must be available"
 
@@ -2824,34 +2826,34 @@ msgstr "Failed to update quota for deleting volume"
 msgid "Volume status must be available or error"
 msgstr "Volume status must be available or error"
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr "Volume still has %d dependent snapshots"
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr "Searching by: %s"
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr "already attached"
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr "already detached"
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr "Volume status must be available to reserve"
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr "must be available"
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
@@ -2860,7 +2862,7 @@ msgstr ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
@@ -2869,27 +2871,27 @@ msgstr ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr "Volume Snapshot status must be available or error"
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr "Metadata property key blank"
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr "Metadata property key greater than 255 characters"
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr "Metadata property value greater than 255 characters"
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr "Volume status must be available/in-use."
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr "Volume status is in-use."
 
@@ -2941,7 +2943,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -3028,120 +3030,120 @@ msgstr "volume %s: creating export"
 msgid "volume %s: create failed"
 msgstr "volume %s: create failed"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: created successfully"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr "Error: %s"
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, 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:372
 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:376
 msgid "No request spec, will not reschedule"
 msgstr "No request spec, will not reschedule"
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: deleting"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 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:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: removing export"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr "volume %s: volume is busy"
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr "Failed to update usages deleting volume"
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: deleted successfully"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr "snapshot %s: creating"
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr "snapshot %(snap_name)s: creating"
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr "snapshot %s: created successfully"
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr "snapshot %s: deleting"
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "snapshot %s: snapshot is busy"
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr "Failed to update usages deleting snapshot"
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr "snapshot %s: deleted successfully"
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr "being attached by another instance"
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, 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:625
+#: cinder/volume/manager.py:624
 #, 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:644
+#: cinder/volume/manager.py:643
 #, 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:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr "Clear capabilities"
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr "Notification {%s} received"
@@ -3403,28 +3405,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr "rbd has no pool %s"
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr "error refreshing volume stats"
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr "Not stored in rbd"
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr "Blank components"
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr "Not an rbd snapshot"
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr "%s is in a different ceph cluster"
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr "Unable to read image %s"
@@ -3609,7 +3611,7 @@ msgstr "enter: check_for_setup_error"
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr "%s is not set"
@@ -5979,17 +5981,17 @@ msgstr "Cannot parse list-view output: %s"
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr "Error running ssh command: %s"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -6015,7 +6017,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr "Volume (%s) already exists on array"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr "Unexpected state while cloning %s"
@@ -6025,9 +6027,6 @@ msgstr "Unexpected state while cloning %s"
 msgid "Login to 3PAR array invalid"
 msgstr "Login to 3PAR array invalid"
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr "The hostname must be called '%s'"
+#~ msgid "The hostname must be called '%s'"
+#~ msgstr "The hostname must be called '%s'"
 

diff --git a/cinder/locale/es/LC_MESSAGES/cinder.po b/cinder/locale/es/LC_MESSAGES/cinder.po
index 35ae807c0391eb1cd1a528d8997be38b888fd2dc..d26744623ac12019a558f09e29cbcdb653e4cce3 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -142,7 +142,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -722,7 +723,7 @@ msgstr "Ejecutando cmd (subprocesos): %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr "El resultado fue %s"
@@ -732,7 +733,7 @@ msgstr "El resultado fue %s"
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "corriendo cmd (SSH): %s"
@@ -858,11 +859,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1276,11 +1277,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Crear volumen de %s GB"
@@ -1290,7 +1291,7 @@ msgstr "Crear volumen de %s GB"
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1782,22 +1783,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1852,7 +1853,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2691,8 +2692,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2744,71 +2745,71 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr "El estado del volumen debe estar disponible"
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 #, fuzzy
 msgid "Volume status must be available to reserve"
 msgstr "El estado del volumen debe estar disponible"
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 #, fuzzy
 msgid "Volume Snapshot status must be available or error"
 msgstr "El estado del volumen debe estar disponible"
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 #, fuzzy
 msgid "Volume status must be available/in-use."
 msgstr "El estado del volumen debe estar disponible"
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2858,7 +2859,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2945,121 +2946,121 @@ msgstr "volumen %s: exportando"
 msgid "volume %s: create failed"
 msgstr "volumen %s: creando"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volumen %s: creado satisfactoriamente"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Capturado error: %s"
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volumen %s: eliminando"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 #, 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:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volumen %s: eliminando exportación"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volumen %s: eliminado satisfactoriamente"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instancia %s: creando snapshot"
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, 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:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3315,29 +3316,29 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 #, fuzzy
 msgid "Not an rbd snapshot"
 msgstr "Captura no valida"
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, fuzzy, python-format
 msgid "Unable to read image %s"
 msgstr "Imposible encontrar volumen %s"
@@ -3524,7 +3525,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5618,17 +5619,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, fuzzy, python-format
 msgid "Error running ssh command: %s"
 msgstr "Error inesperado mientras el comando se ejecutaba"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5652,7 +5653,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr "el grupo %s ya existe"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, fuzzy, python-format
 msgid "Unexpected state while cloning %s"
 msgstr "Error inesperado mientras el comando se ejecutaba"
@@ -5662,23 +5663,12 @@ msgstr "Error inesperado mientras el comando se ejecutaba"
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/fi_FI/LC_MESSAGES/cinder.po b/cinder/locale/fi_FI/LC_MESSAGES/cinder.po
index 62901e0f8548a32057eea29b7b6ef24196296664..3299d2e6139b8d9f643296e1d7e1d74e6609c740 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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) "
@@ -137,7 +137,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -711,7 +712,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -721,7 +722,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -847,11 +848,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1263,11 +1264,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1277,7 +1278,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1765,22 +1766,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1835,7 +1836,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2666,8 +2667,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2718,68 +2719,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2829,7 +2830,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2916,120 +2917,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3285,28 +3286,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3491,7 +3492,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5578,17 +5579,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5612,7 +5613,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5622,23 +5623,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/fr/LC_MESSAGES/cinder.po b/cinder/locale/fr/LC_MESSAGES/cinder.po
index b553b2d576e326604080a9a1402bae3e4a7f94f6..17dd68db45980c09f24e598540a7a68eb0139081 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -142,7 +142,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -722,7 +723,7 @@ msgstr "Execution de la commande (sous-processus) : %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr "Le résultat était %s"
@@ -732,7 +733,7 @@ msgstr "Le résultat était %s"
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Execution de la cmd (SSH): %s"
@@ -858,11 +859,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1276,11 +1277,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Création d'un volume de %s Go"
@@ -1290,7 +1291,7 @@ msgstr "Création d'un volume de %s Go"
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1782,22 +1783,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1852,7 +1853,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2691,8 +2692,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2744,71 +2745,71 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr "Le status du volume doit être disponible"
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 #, fuzzy
 msgid "Volume status must be available to reserve"
 msgstr "Le status du volume doit être disponible"
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 #, fuzzy
 msgid "Volume Snapshot status must be available or error"
 msgstr "Le status du volume doit être disponible"
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 #, fuzzy
 msgid "Volume status must be available/in-use."
 msgstr "Le status du volume doit être disponible"
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2858,7 +2859,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2945,123 +2946,123 @@ msgstr "volume %s: exportation en cours"
 msgid "volume %s: create failed"
 msgstr "volume %s: création"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: crée avec succès"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: suppression"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 #, 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:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: suppression de l'exportation"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: supprimé avec succès"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instance %s: création d'un instantané (snapshot)"
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, 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:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, 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:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3317,29 +3318,29 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr "rbd n'as pas de file %s"
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 #, fuzzy
 msgid "Not an rbd snapshot"
 msgstr "Snapshot invalide"
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, fuzzy, python-format
 msgid "Unable to read image %s"
 msgstr "Impossible de trouver le volume %s"
@@ -3526,7 +3527,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5624,17 +5625,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, fuzzy, python-format
 msgid "Error running ssh command: %s"
 msgstr "Erreur imprévue lors de l'éxecution de la commande"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5658,7 +5659,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr "le groupe %s existe déjà"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, fuzzy, python-format
 msgid "Unexpected state while cloning %s"
 msgstr "Erreur imprévue lors de l'éxecution de la commande"
@@ -5668,23 +5669,12 @@ msgstr "Erreur imprévue lors de l'éxecution de la commande"
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/hr/LC_MESSAGES/cinder.po b/cinder/locale/hr/LC_MESSAGES/cinder.po
index fcd1d2826a21a4611bcf1146c949fd40bd39be06..36e19b068b60d6927cb46c3383ea30344d99264f 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Croatian "
@@ -138,7 +138,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -712,7 +713,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -722,7 +723,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -848,11 +849,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1264,11 +1265,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1278,7 +1279,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1766,22 +1767,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1836,7 +1837,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2667,8 +2668,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2719,68 +2720,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2830,7 +2831,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2917,120 +2918,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3286,28 +3287,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3492,7 +3493,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5579,17 +5580,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5613,7 +5614,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5623,9 +5624,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
+#~ msgid "Expected a uuid but received %(uuid)."
+#~ msgstr ""
+
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
+#~ msgstr ""
+
+#~ msgid "The hostname must be called '%s'"
+#~ msgstr ""
 

diff --git a/cinder/locale/hu/LC_MESSAGES/cinder.po b/cinder/locale/hu/LC_MESSAGES/cinder.po
index 59fada36e8b4670076bf83a00365ce6ee4592622..65e14f4f547859427a14bcbc80a0829b617c065d 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Hungarian "
@@ -137,7 +137,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -711,7 +712,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -721,7 +722,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -847,11 +848,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1263,11 +1264,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1277,7 +1278,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1765,22 +1766,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1835,7 +1836,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2666,8 +2667,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2718,68 +2719,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2829,7 +2830,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2916,120 +2917,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3285,28 +3286,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3491,7 +3492,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5578,17 +5579,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5612,7 +5613,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5622,9 +5623,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
+#~ msgid "Expected a uuid but received %(uuid)."
+#~ msgstr ""
+
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
+#~ msgstr ""
+
+#~ msgid "The hostname must be called '%s'"
+#~ msgstr ""
 

diff --git a/cinder/locale/id/LC_MESSAGES/cinder.po b/cinder/locale/id/LC_MESSAGES/cinder.po
index 5b4b7d137984c61473b2c23d69d56ff34ef2a826..a1671b9cafc9cc0c98e65276db035bb6b2d28a76 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Indonesian "
@@ -137,7 +137,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -711,7 +712,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -721,7 +722,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -847,11 +848,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1263,11 +1264,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1277,7 +1278,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1765,22 +1766,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1835,7 +1836,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2666,8 +2667,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2718,68 +2719,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2829,7 +2830,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2916,120 +2917,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3285,28 +3286,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3491,7 +3492,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5578,17 +5579,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5612,7 +5613,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5622,9 +5623,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
+#~ msgid "Expected a uuid but received %(uuid)."
+#~ msgstr ""
+
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
+#~ msgstr ""
+
+#~ msgid "The hostname must be called '%s'"
+#~ msgstr ""
 

diff --git a/cinder/locale/it/LC_MESSAGES/cinder.po b/cinder/locale/it/LC_MESSAGES/cinder.po
index 82a4280baaba56c277996d874cd690b3e51d3fd1..67885759bcc623f2c6f8a659656fb186232f539b 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -142,7 +142,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -719,7 +720,7 @@ msgstr "Esecuzione del comando (sottoprocesso): %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr "Il risultato é %s"
@@ -729,7 +730,7 @@ msgstr "Il risultato é %s"
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Eseguendo cmd (SSH): %s"
@@ -855,11 +856,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1272,11 +1273,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1286,7 +1287,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1778,22 +1779,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1848,7 +1849,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2683,8 +2684,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2736,71 +2737,71 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr "Lo stato del volume deve essere disponibile"
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 #, fuzzy
 msgid "Volume status must be available to reserve"
 msgstr "Lo stato del volume deve essere disponibile"
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 #, fuzzy
 msgid "Volume Snapshot status must be available or error"
 msgstr "Lo stato del volume deve essere disponibile"
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 #, fuzzy
 msgid "Volume status must be available/in-use."
 msgstr "Lo stato del volume deve essere disponibile"
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2850,7 +2851,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2937,121 +2938,121 @@ msgstr "volume %s: creazione in corso per l'esportazione"
 msgid "volume %s: create failed"
 msgstr "volume %s: creazione in corso"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: creato con successo"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: rimuovendo"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 #, fuzzy
 msgid "volume is not local to this node"
 msgstr "Volume ancora collegato"
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: rimosso con successo"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3307,29 +3308,29 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 #, fuzzy
 msgid "Not an rbd snapshot"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, fuzzy, python-format
 msgid "Unable to read image %s"
 msgstr "Impossibile localizzare il volume %s"
@@ -3515,7 +3516,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5609,17 +5610,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, fuzzy, python-format
 msgid "Error running ssh command: %s"
 msgstr "Si e' verificato un errore inatteso durante l'esecuzione del comando."
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5643,7 +5644,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, fuzzy, python-format
 msgid "Unexpected state while cloning %s"
 msgstr "Si e' verificato un errore inatteso durante l'esecuzione del comando."
@@ -5653,23 +5654,12 @@ msgstr "Si e' verificato un errore inatteso durante l'esecuzione del comando."
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/it_IT/LC_MESSAGES/cinder.po b/cinder/locale/it_IT/LC_MESSAGES/cinder.po
index a473c8fd1f9066ee255771aae4da4d4ab053667e..3a43fea1861d3cae13ce6e4174062c462d6f3efa 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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) "
@@ -137,7 +137,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -711,7 +712,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -721,7 +722,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -847,11 +848,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1263,11 +1264,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1277,7 +1278,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1765,22 +1766,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1835,7 +1836,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2666,8 +2667,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2718,68 +2719,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2829,7 +2830,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2916,120 +2917,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3285,28 +3286,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3491,7 +3492,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5578,17 +5579,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5612,7 +5613,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5622,9 +5623,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
+#~ msgid "Expected a uuid but received %(uuid)."
+#~ msgstr ""
+
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
+#~ msgstr ""
+
+#~ msgid "The hostname must be called '%s'"
+#~ msgstr ""
 

diff --git a/cinder/locale/ja/LC_MESSAGES/cinder.po b/cinder/locale/ja/LC_MESSAGES/cinder.po
index 0707da673e4f1cbe1a08811e5250ad7383187c68..e19077fcbce530e56cc76a0771e56bc461fdb8a6 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -141,7 +141,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -717,7 +718,7 @@ msgstr "コマンド実行(subprocess): %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr "コマンド実行結果： %s"
@@ -727,7 +728,7 @@ msgstr "コマンド実行結果： %s"
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "コマンド（SSH)を実行: %s"
@@ -853,11 +854,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1271,11 +1272,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Create volume: %s GBのボリュームを作成します。"
@@ -1285,7 +1286,7 @@ msgstr "Create volume: %s GBのボリュームを作成します。"
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1777,22 +1778,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1847,7 +1848,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2683,8 +2684,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2736,71 +2737,71 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr "ボリュームのステータス(status)は available でなければなりません。"
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 #, fuzzy
 msgid "Volume status must be available to reserve"
 msgstr "ボリュームのステータス(status)は available でなければなりません。"
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 #, fuzzy
 msgid "Volume Snapshot status must be available or error"
 msgstr "ボリュームのステータス(status)は available でなければなりません。"
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 #, fuzzy
 msgid "Volume status must be available/in-use."
 msgstr "ボリュームのステータス(status)は available でなければなりません。"
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2850,7 +2851,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2937,121 +2938,121 @@ msgstr "ボリューム %s をエクスポートします。"
 msgid "volume %s: create failed"
 msgstr "ボリューム%sを作成します。"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "ボリューム %s の作成に成功しました。"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "エラー %s をキャッチしました。"
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr "ボリューム %s を削除します。"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 #, fuzzy
 msgid "volume is not local to this node"
 msgstr "ボリュームはこのノードのローカルではありません。"
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr "ボリューム %s のエクスポートを解除します。"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "ボリューム %s の削除に成功しました。"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "snapshotting: インスタンス %s のスナップショットを取得中"
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr "存在しないコンソール %(console_id)s を削除しようとしました"
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, 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:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3307,29 +3308,29 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr "rbd にプール %s がありません。"
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 #, fuzzy
 msgid "Not an rbd snapshot"
 msgstr "snapshotting: インスタンス %s のスナップショットを取得中"
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, fuzzy, python-format
 msgid "Unable to read image %s"
 msgstr "ボリューム %s の存在が確認できません。"
@@ -3516,7 +3517,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5610,17 +5611,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, fuzzy, python-format
 msgid "Error running ssh command: %s"
 msgstr "コマンド実行において予期しないエラーが発生しました。"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5644,7 +5645,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr "グループ %s は既に存在しています。"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, fuzzy, python-format
 msgid "Unexpected state while cloning %s"
 msgstr "コマンド実行において予期しないエラーが発生しました。"
@@ -5654,23 +5655,12 @@ msgstr "コマンド実行において予期しないエラーが発生しまし
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/ka_GE/LC_MESSAGES/cinder.po b/cinder/locale/ka_GE/LC_MESSAGES/cinder.po
index d829340169c554a76ea51e1958fb6de8597e7acb..5beb625f57834bd64c508bb10fc82dc1357aa856 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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) "
@@ -137,7 +137,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -711,7 +712,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -721,7 +722,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -847,11 +848,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1263,11 +1264,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1277,7 +1278,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1765,22 +1766,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1835,7 +1836,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2666,8 +2667,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2718,68 +2719,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2829,7 +2830,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2916,120 +2917,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3285,28 +3286,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3491,7 +3492,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5578,17 +5579,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5612,7 +5613,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5622,9 +5623,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
+#~ msgid "Expected a uuid but received %(uuid)."
+#~ msgstr ""
+
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
+#~ msgstr ""
+
+#~ msgid "The hostname must be called '%s'"
+#~ msgstr ""
 

diff --git a/cinder/locale/ko/LC_MESSAGES/cinder.po b/cinder/locale/ko/LC_MESSAGES/cinder.po
index 006feec8c0957c6712a35f2aa746143192d875d3..9066346f30200ee86825cbb22b444fbc5621d3cb 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -141,7 +141,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -715,7 +716,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -725,7 +726,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -851,11 +852,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1268,11 +1269,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1282,7 +1283,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1774,22 +1775,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1844,7 +1845,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2675,8 +2676,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2728,71 +2729,71 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr "볼륨의 상태를 알 수 없습니다"
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 #, fuzzy
 msgid "Volume status must be available to reserve"
 msgstr "볼륨의 상태를 알 수 없습니다"
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 #, fuzzy
 msgid "Volume Snapshot status must be available or error"
 msgstr "볼륨의 상태를 알 수 없습니다"
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 #, fuzzy
 msgid "Volume status must be available/in-use."
 msgstr "볼륨의 상태를 알 수 없습니다"
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2842,7 +2843,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2929,120 +2930,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3298,29 +3299,29 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 #, fuzzy
 msgid "Not an rbd snapshot"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, fuzzy, python-format
 msgid "Unable to read image %s"
 msgstr "%s 볼륨을 찾을수 없습니다"
@@ -3505,7 +3506,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5597,17 +5598,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, fuzzy, python-format
 msgid "Error running ssh command: %s"
 msgstr "명령 실행도중 예측하지 못한 에러가 발생했습니다"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5631,7 +5632,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, fuzzy, python-format
 msgid "Unexpected state while cloning %s"
 msgstr "명령 실행도중 예측하지 못한 에러가 발생했습니다"
@@ -5641,23 +5642,12 @@ msgstr "명령 실행도중 예측하지 못한 에러가 발생했습니다"
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/ko_KR/LC_MESSAGES/cinder.po b/cinder/locale/ko_KR/LC_MESSAGES/cinder.po
index da8461769f4a38dae6df839a80ec268b77c4bd32..689d930b9d98c7b52c79d66c892f7c76602e2d28 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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) "
@@ -137,7 +137,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -711,7 +712,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -721,7 +722,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -847,11 +848,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1263,11 +1264,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1277,7 +1278,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1765,22 +1766,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1835,7 +1836,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2666,8 +2667,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2718,68 +2719,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2829,7 +2830,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2916,120 +2917,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3285,28 +3286,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3491,7 +3492,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5578,17 +5579,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5612,7 +5613,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5622,23 +5623,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/ms/LC_MESSAGES/cinder.po b/cinder/locale/ms/LC_MESSAGES/cinder.po
index 6e86ad2b9408c7845bc4a66bc319a64aafea4132..5503d52749ef7cf9467ee1fa333416921b4c2e1e 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Malay "
@@ -137,7 +137,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -711,7 +712,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -721,7 +722,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -847,11 +848,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1263,11 +1264,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1277,7 +1278,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1765,22 +1766,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1835,7 +1836,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2666,8 +2667,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2718,68 +2719,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2829,7 +2830,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2916,120 +2917,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3285,28 +3286,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3491,7 +3492,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5578,17 +5579,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5612,7 +5613,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5622,9 +5623,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
+#~ msgid "Expected a uuid but received %(uuid)."
+#~ msgstr ""
+
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
+#~ msgstr ""
+
+#~ msgid "The hostname must be called '%s'"
+#~ msgstr ""
 

diff --git a/cinder/locale/nb/LC_MESSAGES/cinder.po b/cinder/locale/nb/LC_MESSAGES/cinder.po
index 56f3a2a2884fc0c2de94ad4a906ae82d8b54248d..19544a08a25ae75d1d33eb4771321212c591942d 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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 "
@@ -137,7 +137,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -711,7 +712,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -721,7 +722,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -847,11 +848,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1263,11 +1264,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1277,7 +1278,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1765,22 +1766,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1835,7 +1836,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2666,8 +2667,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2718,68 +2719,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2829,7 +2830,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2916,120 +2917,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3285,28 +3286,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3491,7 +3492,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5578,17 +5579,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5612,7 +5613,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5622,9 +5623,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
+#~ msgid "Expected a uuid but received %(uuid)."
+#~ msgstr ""
+
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
+#~ msgstr ""
+
+#~ msgid "The hostname must be called '%s'"
+#~ msgstr ""
 

diff --git a/cinder/locale/nl_NL/LC_MESSAGES/cinder.po b/cinder/locale/nl_NL/LC_MESSAGES/cinder.po
index bf93a344f38fda5e0c077cc5475d135f2e5b9acf..beaaaa4ffde75ea98f04b0b9b38b63042147305e 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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) "
@@ -137,7 +137,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -711,7 +712,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -721,7 +722,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -847,11 +848,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1263,11 +1264,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1277,7 +1278,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1765,22 +1766,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1835,7 +1836,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2666,8 +2667,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2718,68 +2719,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2829,7 +2830,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2916,120 +2917,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3285,28 +3286,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3491,7 +3492,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5578,17 +5579,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5612,7 +5613,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5622,9 +5623,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
+#~ msgid "Expected a uuid but received %(uuid)."
+#~ msgstr ""
+
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
+#~ msgstr ""
+
+#~ msgid "The hostname must be called '%s'"
+#~ msgstr ""
 

diff --git a/cinder/locale/pt/LC_MESSAGES/cinder.po b/cinder/locale/pt/LC_MESSAGES/cinder.po
index 68e381695bcf43588247238464ab38fac81488c4..e639808048b19f30b10d928baa59f5f8454e929c 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese "
@@ -137,7 +137,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -711,7 +712,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -721,7 +722,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -847,11 +848,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1263,11 +1264,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1277,7 +1278,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1765,22 +1766,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1835,7 +1836,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2666,8 +2667,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2718,68 +2719,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2829,7 +2830,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2916,120 +2917,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3285,28 +3286,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3491,7 +3492,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5578,17 +5579,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5612,7 +5613,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5622,9 +5623,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
+#~ msgid "Expected a uuid but received %(uuid)."
+#~ msgstr ""
+
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
+#~ msgstr ""
+
+#~ msgid "The hostname must be called '%s'"
+#~ msgstr ""
 

diff --git a/cinder/locale/pt_BR/LC_MESSAGES/cinder.po b/cinder/locale/pt_BR/LC_MESSAGES/cinder.po
index 0cb1752f9f51e2f8eee027411f6b882db4af86f1..71a8b0384985a7e91cfb08e3efa83bdec3ed7b6f 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -141,7 +141,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -718,7 +719,7 @@ msgstr "Executando comando (subprocesso): %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr "Resultado foi %s"
@@ -728,7 +729,7 @@ msgstr "Resultado foi %s"
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Executando o comando (SSH): %s"
@@ -854,11 +855,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1271,11 +1272,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Criar volume de %s GB"
@@ -1285,7 +1286,7 @@ msgstr "Criar volume de %s GB"
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1777,22 +1778,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1847,7 +1848,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2681,8 +2682,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2734,71 +2735,71 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr "O status do volume parece estar disponível"
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 #, fuzzy
 msgid "Volume status must be available to reserve"
 msgstr "O status do volume parece estar disponível"
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 #, fuzzy
 msgid "Volume Snapshot status must be available or error"
 msgstr "O status do volume parece estar disponível"
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 #, fuzzy
 msgid "Volume status must be available/in-use."
 msgstr "O status do volume parece estar disponível"
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2848,7 +2849,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2935,121 +2936,121 @@ msgstr "volume %s: criando o export"
 msgid "volume %s: create failed"
 msgstr "volume %s: criando"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: criado com sucesso"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Capturado o erro: %s"
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: removendo"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 #, 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:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: removendo export"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: remoção realizada com sucesso"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instância %s: fazendo um snapshot"
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, 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:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3305,29 +3306,29 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 #, fuzzy
 msgid "Not an rbd snapshot"
 msgstr "instância %s: fazendo um snapshot"
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, fuzzy, python-format
 msgid "Unable to read image %s"
 msgstr "Não é possível localizar o volume %s"
@@ -3514,7 +3515,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5608,17 +5609,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, fuzzy, python-format
 msgid "Error running ssh command: %s"
 msgstr "Erro inesperado ao executar o comando."
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5642,7 +5643,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr "group %s já existe"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, fuzzy, python-format
 msgid "Unexpected state while cloning %s"
 msgstr "Erro inesperado ao executar o comando."
@@ -5652,23 +5653,12 @@ msgstr "Erro inesperado ao executar o comando."
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/ru/LC_MESSAGES/cinder.po b/cinder/locale/ru/LC_MESSAGES/cinder.po
index 505ae53de4539b0f30ff229ab35cd3ae74cc44a6..6ee4d7f2ab9ba01333b30889fff444abf17dfed9 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -143,7 +143,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "Образ %(image_id)s недопустим: %(reason)s"
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -728,7 +729,7 @@ msgstr "Выполнение команды (субпроцесс): %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr "Результат %s"
@@ -738,7 +739,7 @@ msgstr "Результат %s"
 msgid "%r failed. Retrying."
 msgstr "%r ошибка. Выполняется повтор."
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Выполнение команды (SSH): %s"
@@ -865,11 +866,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1289,11 +1290,11 @@ msgid "Delete volume with id: %s"
 msgstr "Удалить том с идентификатором: %s"
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Создание раздела %s ГБ"
@@ -1303,7 +1304,7 @@ msgstr "Создание раздела %s ГБ"
 msgid "Removing options '%(bad_options)s' from query"
 msgstr "Удаление параметров '%(unk_opt_str)s' из запроса"
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, fuzzy, python-format
 msgid "Removing options '%s' from query"
 msgstr "Удаление параметров '%(unk_opt_str)s' из запроса"
@@ -1795,22 +1796,22 @@ msgstr "Нераспознанное значение read_deleted '%s'"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1865,7 +1866,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2717,8 +2718,8 @@ msgstr "Декодирование JSON: %s"
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2770,71 +2771,71 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr "Состояние тома должно быть доступно"
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr "Поиск по: %s"
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 #, fuzzy
 msgid "Volume status must be available to reserve"
 msgstr "Состояние тома должно быть доступно"
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, fuzzy, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr "Превышена квота для %(pid)s, попытка создания тома %(size)sG"
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, fuzzy, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr "Превышена квота для %(pid)s, попытка выполнить %(min_count)s копий"
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 #, fuzzy
 msgid "Volume Snapshot status must be available or error"
 msgstr "Состояние тома должно быть доступно"
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 #, fuzzy
 msgid "Volume status must be available/in-use."
 msgstr "Состояние тома должно быть доступно"
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 #, fuzzy
 msgid "Volume status is in-use."
 msgstr "том %s: том занят"
@@ -2887,7 +2888,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr "Найден узел iSCSI %(mount_device)s (после %(tries)s повторных проверок)"
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2975,122 +2976,122 @@ msgstr "том %s: создание экспортирования"
 msgid "volume %s: create failed"
 msgstr "том %s: создание"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "том %s: создание завершено"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Ошибка БД: %s"
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr "том %s: удаление"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 #, fuzzy
 msgid "volume is not local to this node"
 msgstr "Том до сих пор присоединён"
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr "том %s: удаление экспортирования"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr "том %s: том занят"
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 #, fuzzy
 msgid "Failed to update usages deleting volume"
 msgstr "Ошибка обновления агента: %(resp)r"
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "том %s: удаление завершено"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr "снимок %s: создание"
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr "снимок %(snap_name)s: создание"
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr "снимок %s: создание завершено"
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr "снимок %s: удаление"
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "снимок %s: создание завершено"
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr "снимок %s: удаление выполнено"
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr "Выполнена попытка удаления несуществующей консоли %(console_id)s."
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, 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:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr "Очистить возможности"
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr "Принято уведомление {%s}"
@@ -3347,29 +3348,29 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr "rbd не имеет пула %s"
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 #, fuzzy
 msgid "Not an rbd snapshot"
 msgstr "Недопустимый снимок"
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, fuzzy, python-format
 msgid "Unable to read image %s"
 msgstr "Невозможно найти том %s"
@@ -3557,7 +3558,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5664,17 +5665,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr "LUID не найден для %(zfs_poolname)s. Вывод=%(out)s"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, fuzzy, python-format
 msgid "Error running ssh command: %s"
 msgstr "Ошибка в соглашении: %s"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5698,7 +5699,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr "группа %s уже существует"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, fuzzy, python-format
 msgid "Unexpected state while cloning %s"
 msgstr "Неожиданная ошибка при выполнении команды."
@@ -5708,23 +5709,12 @@ msgstr "Неожиданная ошибка при выполнении кома
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/ru_RU/LC_MESSAGES/cinder.po b/cinder/locale/ru_RU/LC_MESSAGES/cinder.po
index 789a4aa0962372fe3738140f1d9261bcb26726f2..357e025a88e3a05748155d9725b76e70557935ba 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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) "
@@ -138,7 +138,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -712,7 +713,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -722,7 +723,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -848,11 +849,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1264,11 +1265,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1278,7 +1279,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1766,22 +1767,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1836,7 +1837,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2667,8 +2668,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2719,68 +2720,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2830,7 +2831,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2917,120 +2918,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3286,28 +3287,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3492,7 +3493,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5579,17 +5580,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5613,7 +5614,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5623,9 +5624,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
+#~ msgid "Expected a uuid but received %(uuid)."
+#~ msgstr ""
+
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
+#~ msgstr ""
+
+#~ msgid "The hostname must be called '%s'"
+#~ msgstr ""
 

diff --git a/cinder/locale/sw_KE/LC_MESSAGES/cinder.po b/cinder/locale/sw_KE/LC_MESSAGES/cinder.po
index 6a8e6c3a9d936dbfff424b5843f57ff352cadae8..6c96cb2f4958e02b0d279a6acd3a21f5f2ab3789 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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) "
@@ -137,7 +137,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -711,7 +712,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -721,7 +722,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -847,11 +848,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1263,11 +1264,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1277,7 +1278,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1765,22 +1766,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1835,7 +1836,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2666,8 +2667,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2718,68 +2719,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2829,7 +2830,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2916,120 +2917,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3285,28 +3286,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3491,7 +3492,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5578,17 +5579,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5612,7 +5613,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5622,9 +5623,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
+#~ msgid "Expected a uuid but received %(uuid)."
+#~ msgstr ""
+
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
+#~ msgstr ""
+
+#~ msgid "The hostname must be called '%s'"
+#~ msgstr ""
 

diff --git a/cinder/locale/tl/LC_MESSAGES/cinder.po b/cinder/locale/tl/LC_MESSAGES/cinder.po
index a01dc7e79831324019f0c9bdf6faef19a9cf9d4e..c5b90f07117132fb417f246b8efaefe04ec4e724 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -136,7 +136,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -710,7 +711,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -720,7 +721,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -846,11 +847,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1262,11 +1263,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1276,7 +1277,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1764,22 +1765,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1834,7 +1835,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2665,8 +2666,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2717,68 +2718,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2828,7 +2829,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2915,120 +2916,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3284,28 +3285,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3490,7 +3491,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5579,17 +5580,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, fuzzy, python-format
 msgid "Error running ssh command: %s"
 msgstr "Merong hindi-inaasahang pagkakamali habang tumatakbo ang command."
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5613,7 +5614,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, fuzzy, python-format
 msgid "Unexpected state while cloning %s"
 msgstr "Merong hindi-inaasahang pagkakamali habang tumatakbo ang command."
@@ -5623,23 +5624,12 @@ msgstr "Merong hindi-inaasahang pagkakamali habang tumatakbo ang command."
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/tr/LC_MESSAGES/cinder.po b/cinder/locale/tr/LC_MESSAGES/cinder.po
index 6522993b48a749bca5d4cd22fb6bb89b7a3d4298..b4c75b6e5c6244a857c264114ecf9cd6d7775ade 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -136,7 +136,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -710,7 +711,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -720,7 +721,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -846,11 +847,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1262,11 +1263,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1276,7 +1277,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1764,22 +1765,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1834,7 +1835,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2665,8 +2666,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2717,68 +2718,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2828,7 +2829,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2915,120 +2916,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3284,28 +3285,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3490,7 +3491,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5577,17 +5578,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5611,7 +5612,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5621,23 +5622,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/tr_TR/LC_MESSAGES/cinder.po b/cinder/locale/tr_TR/LC_MESSAGES/cinder.po
index 817854da60c73fedafc3abd45a723423685ce39e..3422fba7498700331706fff78196eefbdb2958d7 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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) "
@@ -137,7 +137,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -711,7 +712,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -721,7 +722,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -847,11 +848,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1263,11 +1264,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1277,7 +1278,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1765,22 +1766,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1835,7 +1836,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2666,8 +2667,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2718,68 +2719,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2829,7 +2830,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2916,120 +2917,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3285,28 +3286,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3491,7 +3492,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5578,17 +5579,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5612,7 +5613,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5622,9 +5623,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
+#~ msgid "Expected a uuid but received %(uuid)."
+#~ msgstr ""
+
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
+#~ msgstr ""
+
+#~ msgid "The hostname must be called '%s'"
+#~ msgstr ""
 

diff --git a/cinder/locale/uk/LC_MESSAGES/cinder.po b/cinder/locale/uk/LC_MESSAGES/cinder.po
index ca8a5431265d4dcef1449b23e7b76de0439d4436..1b0d2f842d8bb2628a7964394c75632b66f595da 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -137,7 +137,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -711,7 +712,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -721,7 +722,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -847,11 +848,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1263,11 +1264,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Створити розділ на %s ГБ"
@@ -1277,7 +1278,7 @@ msgstr "Створити розділ на %s ГБ"
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1765,22 +1766,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1835,7 +1836,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2666,8 +2667,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2718,68 +2719,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2829,7 +2830,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2916,120 +2917,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3285,28 +3286,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3491,7 +3492,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5580,17 +5581,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, fuzzy, python-format
 msgid "Error running ssh command: %s"
 msgstr "Неочікувана помилка при виконанні команди."
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5614,7 +5615,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, fuzzy, python-format
 msgid "Unexpected state while cloning %s"
 msgstr "Неочікувана помилка при виконанні команди."
@@ -5624,23 +5625,12 @@ msgstr "Неочікувана помилка при виконанні кома
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/vi_VN/LC_MESSAGES/cinder.po b/cinder/locale/vi_VN/LC_MESSAGES/cinder.po
index e524fa52c9842a2f9c97dd58e026bf7abb040376..39ec508ac4ece403307d9bf088dfc3afbc01062d 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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) "
@@ -137,7 +137,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -711,7 +712,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -721,7 +722,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -847,11 +848,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1263,11 +1264,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1277,7 +1278,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1765,22 +1766,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1835,7 +1836,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2666,8 +2667,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2718,68 +2719,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2829,7 +2830,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2916,120 +2917,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3285,28 +3286,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3491,7 +3492,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5578,17 +5579,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5612,7 +5613,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5622,23 +5623,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/zh_CN/LC_MESSAGES/cinder.po b/cinder/locale/zh_CN/LC_MESSAGES/cinder.po
index a5f2d898e2bcbeab60246227318d7a4c50076aa4..dadb3786705b5aa9bb26933c82e886173e3231c5 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -142,7 +142,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "镜像 %(image_id)s 无法接受，原因是： %(reason)s"
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -721,7 +722,7 @@ msgstr "正在运行cmd (subprocess)：%s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr "运行结果为 %s"
@@ -731,7 +732,7 @@ msgstr "运行结果为 %s"
 msgid "%r failed. Retrying."
 msgstr "%r 失败，重试。"
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "运行cmd (SSH)：%s"
@@ -858,11 +859,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr "limit 参数必须是整数"
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr "limit参数必须是正数"
 
@@ -1278,11 +1279,11 @@ msgid "Delete volume with id: %s"
 msgstr "删除id为 %s 的卷"
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr "提供了无效的imageRef。"
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "创建 %s GB的卷"
@@ -1292,7 +1293,7 @@ msgstr "创建 %s GB的卷"
 msgid "Removing options '%(bad_options)s' from query"
 msgstr "正在从查询语句中移除选项 '%(unk_opt_str)s'"
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, fuzzy, python-format
 msgid "Removing options '%s' from query"
 msgstr "正在从查询语句中移除选项 '%(unk_opt_str)s'"
@@ -1784,22 +1785,22 @@ msgstr "无法识别的 read_deleted 取值”%s“"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr "没有id为%(sm_backend_id)s的后台配置"
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr "没有 sm_flavor 调用 %(sm_flavor)s"
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr "没有id为 %(volume_id)s 的 sm_volume"
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, fuzzy, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr "没有id为%(sm_backend_id)s的后台配置"
@@ -1857,7 +1858,7 @@ msgid "reservations table not dropped"
 msgstr "dns_domains 表没有删除"
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2714,8 +2715,8 @@ msgstr "解码JSON：%s"
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr "状态必须可用"
 
@@ -2767,73 +2768,73 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr "卷组状态必须可获取"
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr "搜索条件： %s"
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr "已经附加"
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr "已经分离"
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 #, fuzzy
 msgid "Volume status must be available to reserve"
 msgstr "卷组状态必须可获取"
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr "必须可用"
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, fuzzy, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr "%(pid)s 的配额超出，尝试创建 %(size)sG 的卷"
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, fuzzy, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr "%(pid)s 已经超过配额，试图运行 %(min_count)s 个实例"
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 #, fuzzy
 msgid "Volume Snapshot status must be available or error"
 msgstr "卷组状态必须可获取"
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 #, fuzzy
 msgid "Metadata property key greater than 255 characters"
 msgstr "安全组 %s 不能比255个字符更长。"
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 #, fuzzy
 msgid "Metadata property value greater than 255 characters"
 msgstr "安全组 %s 不能比255个字符更长。"
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 #, fuzzy
 msgid "Volume status must be available/in-use."
 msgstr "卷组状态必须可获取"
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 #, fuzzy
 msgid "Volume status is in-use."
 msgstr "卷 %s：卷繁忙"
@@ -2884,7 +2885,7 @@ msgstr "在 %(mount_device)s 上还没有找到iSCSI卷。将再次扫描并重
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr "找到iSCSI节点 %(mount_device)s （经过%(tries)s 次再扫描）"
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2972,122 +2973,122 @@ msgstr "卷%s：正在创建导出"
 msgid "volume %s: create failed"
 msgstr "卷 %s: 创建中"
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "卷%s：创建成功"
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "数据库错误：%s"
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr "卷%s：删除中"
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 #, fuzzy
 msgid "volume is not local to this node"
 msgstr "卷不属于这个节点"
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr "卷%s：正在移除导出"
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr "卷 %s：卷繁忙"
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 #, fuzzy
 msgid "Failed to update usages deleting volume"
 msgstr "更新代理失败：%(resp)r"
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "卷%s：删除成功"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr "快照 %s：正在创建"
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr "快照 %(snap_name)s：正在创建"
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr "快照 %s：创建成功"
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr "快照 %s：正在删除"
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "快照 %s：创建成功"
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr "快照 %s：删除成功"
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, 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:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, 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:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr "清理能力"
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr "收到通知 {%s}"
@@ -3344,29 +3345,29 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr "RBD没有池 %s"
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 #, fuzzy
 msgid "Not an rbd snapshot"
 msgstr "无效的快照"
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, fuzzy, python-format
 msgid "Unable to read image %s"
 msgstr "无法找到 %s 卷"
@@ -3554,7 +3555,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, fuzzy, python-format
 msgid "%s is not set"
 msgstr "租户ID没有设"
@@ -5661,17 +5662,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr "没有为 %(zfs_poolname)s 找到LUID。Output=%(out)s"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, fuzzy, python-format
 msgid "Error running ssh command: %s"
 msgstr "握手出错：%s"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5695,7 +5696,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr "安全组 %s 已经存在"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, fuzzy, python-format
 msgid "Unexpected state while cloning %s"
 msgstr "运行命令时出现意外错误"
@@ -5705,23 +5706,12 @@ msgstr "运行命令时出现意外错误"
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""
 

diff --git a/cinder/locale/zh_HK/LC_MESSAGES/cinder.po b/cinder/locale/zh_HK/LC_MESSAGES/cinder.po
index 66d90ce9e172daf9f0837a4421b25681bea545b8..85bcdc1e9060c8c4d950a02fced51e8c94800434 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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) "
@@ -137,7 +137,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -711,7 +712,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -721,7 +722,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -847,11 +848,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1263,11 +1264,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1277,7 +1278,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1765,22 +1766,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1835,7 +1836,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2666,8 +2667,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2718,68 +2719,68 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2829,7 +2830,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2916,120 +2917,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3285,28 +3286,28 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, python-format
 msgid "Unable to read image %s"
 msgstr ""
@@ -3491,7 +3492,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5578,17 +5579,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, python-format
 msgid "Error running ssh command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5612,7 +5613,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, python-format
 msgid "Unexpected state while cloning %s"
 msgstr ""
@@ -5622,9 +5623,12 @@ msgstr ""
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
+#~ msgid "Expected a uuid but received %(uuid)."
+#~ msgstr ""
+
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
+#~ msgstr ""
+
+#~ msgid "The hostname must be called '%s'"
+#~ msgstr ""
 

diff --git a/cinder/locale/zh_TW/LC_MESSAGES/cinder.po b/cinder/locale/zh_TW/LC_MESSAGES/cinder.po
index e2acc6e1b360a119bb5adbc829f6eb76bce57ef1..c954fcf38a57ad555376d24175363db33b024049 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-05-29 18:11+0000\n"
+"POT-Creation-Date: 2013-05-31 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"
@@ -141,7 +141,8 @@ msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:219
-msgid "Expected a uuid but received %(uuid)."
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
 #: cinder/exception.py:223
@@ -718,7 +719,7 @@ msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
 #: cinder/openstack/common/processutils.py:162
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:226
 #, python-format
 msgid "Result was %s"
 msgstr ""
@@ -728,7 +729,7 @@ msgstr ""
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:199
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
@@ -854,11 +855,11 @@ msgid ""
 "cinder.api.middleware.auth:pipeline_factory instead."
 msgstr ""
 
-#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:363
+#: cinder/api/common.py:63 cinder/api/common.py:97 cinder/volume/api.py:367
 msgid "limit param must be an integer"
 msgstr ""
 
-#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:360
+#: cinder/api/common.py:66 cinder/api/common.py:101 cinder/volume/api.py:364
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1270,11 +1271,11 @@ msgid "Delete volume with id: %s"
 msgstr ""
 
 #: cinder/api/v1/volumes.py:278 cinder/api/v1/volumes.py:282
-#: cinder/api/v2/volumes.py:227 cinder/api/v2/volumes.py:231
+#: cinder/api/v2/volumes.py:230 cinder/api/v2/volumes.py:234
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:290
+#: cinder/api/v1/volumes.py:339 cinder/api/v2/volumes.py:293
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
@@ -1284,7 +1285,7 @@ msgstr ""
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:378
+#: cinder/api/v2/volumes.py:381
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -1776,22 +1777,22 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1797 cinder/db/sqlalchemy/api.py:1823
+#: cinder/db/sqlalchemy/api.py:1799 cinder/db/sqlalchemy/api.py:1825
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1880
+#: cinder/db/sqlalchemy/api.py:1882
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1924
+#: cinder/db/sqlalchemy/api.py:1926
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1987
+#: cinder/db/sqlalchemy/api.py:1989
 #, python-format
 msgid "No backup with id %(backup_id)s"
 msgstr ""
@@ -1846,7 +1847,7 @@ msgid "reservations table not dropped"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
-msgid "Exception while creating table 'volume_glance_metedata'"
+msgid "Exception while creating table 'volume_glance_metadata'"
 msgstr ""
 
 #: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
@@ -2679,8 +2680,8 @@ msgstr ""
 msgid "May specify only one of snapshot, imageRef or source volume"
 msgstr ""
 
-#: cinder/volume/api.py:104 cinder/volume/api.py:453
-#: cinder/volume/manager.py:559
+#: cinder/volume/api.py:104 cinder/volume/api.py:457
+#: cinder/volume/manager.py:558
 msgid "status must be available"
 msgstr ""
 
@@ -2732,71 +2733,71 @@ msgstr ""
 msgid "Volume status must be available or error"
 msgstr "Volume 狀態需要可被使用"
 
-#: cinder/volume/api.py:325
+#: cinder/volume/api.py:329
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:378 cinder/volume/api.py:436
+#: cinder/volume/api.py:382 cinder/volume/api.py:440
 #: cinder/volume/volume_types.py:65
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: cinder/volume/api.py:456
+#: cinder/volume/api.py:460
 msgid "already attached"
 msgstr ""
 
-#: cinder/volume/api.py:463
+#: cinder/volume/api.py:467
 msgid "already detached"
 msgstr ""
 
-#: cinder/volume/api.py:474
+#: cinder/volume/api.py:478
 #, fuzzy
 msgid "Volume status must be available to reserve"
 msgstr "Volume 狀態需要可被使用"
 
-#: cinder/volume/api.py:523
+#: cinder/volume/api.py:527
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:541
+#: cinder/volume/api.py:545
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:550
+#: cinder/volume/api.py:554
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:599
+#: cinder/volume/api.py:603
 #, fuzzy
 msgid "Volume Snapshot status must be available or error"
 msgstr "Volume 狀態需要可被使用"
 
-#: cinder/volume/api.py:627
+#: cinder/volume/api.py:631
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:631
+#: cinder/volume/api.py:635
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:635
+#: cinder/volume/api.py:639
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:724
 #, fuzzy
 msgid "Volume status must be available/in-use."
 msgstr "Volume 狀態需要可被使用"
 
-#: cinder/volume/api.py:723
+#: cinder/volume/api.py:727
 msgid "Volume status is in-use."
 msgstr ""
 
@@ -2846,7 +2847,7 @@ msgstr ""
 msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: cinder/volume/driver.py:469 cinder/volume/manager.py:707
+#: cinder/volume/driver.py:469 cinder/volume/manager.py:706
 #: cinder/volume/drivers/lvm.py:560 cinder/volume/drivers/lvm.py:676
 #: cinder/volume/drivers/storwize_svc.py:1344
 #: cinder/volume/drivers/emc/emc_smis_common.py:855
@@ -2933,120 +2934,120 @@ msgstr ""
 msgid "volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:321
+#: cinder/volume/manager.py:320
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:329
+#: cinder/volume/manager.py:328
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:355
+#: cinder/volume/manager.py:354
 #, python-format
 msgid "volume %s: Error trying to reschedule create"
 msgstr ""
 
-#: cinder/volume/manager.py:373
+#: cinder/volume/manager.py:372
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:377
+#: cinder/volume/manager.py:376
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/manager.py:382
+#: cinder/volume/manager.py:381
 #, 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:410 cinder/volume/manager.py:423
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:417
+#: cinder/volume/manager.py:416
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:422
+#: cinder/volume/manager.py:421
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: cinder/volume/manager.py:427
+#: cinder/volume/manager.py:426
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:445
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:449
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:464
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:470
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:488
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:496 cinder/volume/manager.py:506
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:509
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:534
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:555
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:614 cinder/volume/manager.py:619
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/manager.py:625
+#: cinder/volume/manager.py:624
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:643
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:720
+#: cinder/volume/manager.py:719
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:723
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -3302,29 +3303,29 @@ msgstr ""
 msgid "rbd has no pool %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:87 cinder/volume/drivers/sheepdog.py:134
+#: cinder/volume/drivers/rbd.py:104 cinder/volume/drivers/sheepdog.py:134
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:220
+#: cinder/volume/drivers/rbd.py:240
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:224
+#: cinder/volume/drivers/rbd.py:244
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:227
+#: cinder/volume/drivers/rbd.py:247
 #, fuzzy
 msgid "Not an rbd snapshot"
 msgstr "無效的快照(snapshot)"
 
-#: cinder/volume/drivers/rbd.py:242
+#: cinder/volume/drivers/rbd.py:262
 #, python-format
 msgid "%s is in a different ceph cluster"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:253
+#: cinder/volume/drivers/rbd.py:273
 #, fuzzy, python-format
 msgid "Unable to read image %s"
 msgstr "找不到Volume %s"
@@ -3510,7 +3511,7 @@ msgstr ""
 #: cinder/volume/drivers/netapp/nfs.py:109
 #: cinder/volume/drivers/netapp/nfs.py:328
 #: cinder/volume/drivers/netapp/nfs.py:379
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:118
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:120
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5602,17 +5603,17 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts: '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
 #, fuzzy, python-format
 msgid "Error running ssh command: %s"
 msgstr "非預期的執行錯誤"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:446
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
 #: cinder/volume/drivers/san/hp/hp_3par_fc.py:104
 #: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:103
 #, python-format
@@ -5636,7 +5637,7 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:632
 #, fuzzy, python-format
 msgid "Unexpected state while cloning %s"
 msgstr "非預期的執行錯誤"
@@ -5646,23 +5647,12 @@ msgstr "非預期的執行錯誤"
 msgid "Login to 3PAR array invalid"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:218
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:237
-#, python-format
-msgid "The hostname must be called '%s'"
-msgstr ""
-
-#~ msgid "Failed to copy image to volume"
-#~ msgstr ""
-
-#~ msgid "service is down or disabled."
+#~ msgid "Expected a uuid but received %(uuid)."
 #~ msgstr ""
 
-#~ msgid "Downloaded image %(image_id)s to %(volume_id)s successfully"
+#~ msgid "Exception while creating table 'volume_glance_metedata'"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Error Create Snapshot: (snapshot)s Volume: "
-#~ "%(volume)s Error: %(errordesc)s"
+#~ msgid "The hostname must be called '%s'"
 #~ msgstr ""