Imported Translations from Transifex

Change-Id: I0a33030fb608d564eb0717f5107553254c888e78

diff --git a/cinder/locale/bg_BG/LC_MESSAGES/cinder.po b/cinder/locale/bg_BG/LC_MESSAGES/cinder.po
index 234ce727dfff585597a083d0771b8b0e0295351e..c179b9d3ff062a57117192c0e06590a7777200de 100644 (file)
--- a/cinder/locale/bg_BG/LC_MESSAGES/cinder.po
+++ b/cinder/locale/bg_BG/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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) "
@@ -591,35 +591,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -644,12 +644,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -706,33 +706,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -789,7 +791,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1315,43 +1317,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1948,22 +1950,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1983,7 +1985,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2053,17 +2055,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2764,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2964,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3095,76 +3097,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5864,20 +5866,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/bs/LC_MESSAGES/cinder.po b/cinder/locale/bs/LC_MESSAGES/cinder.po
index dca48172b7c538b6dc85f58d20ebccb5e125feb7..51fc9f2fbc54a1537d321cc51fa8c8aef9a9dcb1 100644 (file)
--- a/cinder/locale/bs/LC_MESSAGES/cinder.po
+++ b/cinder/locale/bs/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -590,35 +590,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -628,7 +628,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -643,12 +643,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -705,33 +705,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -788,7 +790,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1314,47 +1316,47 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 #, fuzzy
 msgid "Backup status must be available or error"
 msgstr "Status volumena mora biti omogućen"
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 #, fuzzy
 msgid "Volume to be backed up must be available"
 msgstr "Status volumena mora biti omogućen"
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 #, fuzzy
 msgid "Backup status must be available"
 msgstr "Status volumena mora biti omogućen"
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 #, fuzzy
 msgid "Volume to be restored to must be available"
 msgstr "Status volumena mora biti omogućen"
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1952,22 +1954,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1987,7 +1989,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2057,17 +2059,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2768,7 +2770,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2972,7 +2974,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3103,76 +3105,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5872,20 +5874,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr "Neočekivana greška prilikom pokretanja komande."
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/ca/LC_MESSAGES/cinder.po b/cinder/locale/ca/LC_MESSAGES/cinder.po
index d8a18d0f447d0880bd48a242402ba7c3c95a459a..6904973776f4c239c98df14b3497c2c4b59484fb 100644 (file)
--- a/cinder/locale/ca/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ca/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Catalan "
@@ -591,35 +591,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -644,12 +644,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -706,33 +706,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -789,7 +791,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1315,43 +1317,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1948,22 +1950,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1983,7 +1985,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2053,17 +2055,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2764,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2964,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3095,76 +3097,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5864,20 +5866,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/cinder.pot b/cinder/locale/cinder.pot
index 5e67a2e64de6edb84632ef9f460c91ce7ffa1a64..8e3402cc60f39c761d05f530f701e21b1a362fe8 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.27\n"
+"Project-Id-Version: cinder jenkins.cinder.propose.translation.update.28\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -590,35 +590,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -628,7 +628,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -643,12 +643,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -705,33 +705,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -788,7 +790,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1314,43 +1316,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1947,22 +1949,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1982,7 +1984,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2052,17 +2054,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2763,7 +2765,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2963,7 +2965,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3094,76 +3096,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""

diff --git a/cinder/locale/cs/LC_MESSAGES/cinder.po b/cinder/locale/cs/LC_MESSAGES/cinder.po
index ec6eb16bd3384d2f12f2d0351ef3a586ffb1df4f..e9c97cf3fdc34e481fde4b822acfcfc1372ac37e 100644 (file)
--- a/cinder/locale/cs/LC_MESSAGES/cinder.po
+++ b/cinder/locale/cs/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -606,36 +606,36 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 #, fuzzy
 msgid "Unhandled exception"
 msgstr "Vnitřní výjimka: %s"
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -645,7 +645,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -660,12 +660,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr "Vyvoláno Nenalezeno: %s"
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -710,7 +710,7 @@ msgstr "%(flag)s : SADA PŽÍZNAKŮ "
 msgid "Fetching %s"
 msgstr "Získávání %s"
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr "Získány neznámé argumenty klíčového slova pro utils.execute: %r"
@@ -722,33 +722,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Spouštění příkazu (podproces): %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr "Výsledek byl %s"
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r selhalo. Opakování."
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Spouštění příkazu (SSH): %s"
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr "Prostředí není podporováno přes SSH"
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr "process_input není podporován přes SSH"
 
@@ -805,7 +807,7 @@ msgstr "timefunc: '%(name)s' trvalo %(total_time).2f sek"
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1339,47 +1341,47 @@ msgstr "Odstraňování voleb '%(unk_opt_str)s' z fronty"
 msgid "Removing options '%s' from query"
 msgstr "Odstraňování voleb '%(unk_opt_str)s' z fronty"
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 #, fuzzy
 msgid "Backup status must be available or error"
 msgstr "Obraz musí být dostupný"
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 #, fuzzy
 msgid "Volume to be backed up must be available"
 msgstr "Obraz musí být dostupný"
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 #, fuzzy
 msgid "Backup status must be available"
 msgstr "Obraz musí být dostupný"
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 #, fuzzy
 msgid "Volume to be restored to must be available"
 msgstr "Obraz musí být dostupný"
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1977,22 +1979,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, fuzzy, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "Získán semafor \"%(lock)s\" pro zámek metody \"%(method)s\""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, fuzzy, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "Pokus o získání zámku souboru \"%(lock)s\" pro zámek metody \"%(method)s\""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, fuzzy, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr "Získán zámek souboru \"%(lock)s\" pro zámek metody \"%(method)s\""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, fuzzy, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr "Získán zámek souboru \"%(lock)s\" pro zámek metody \"%(method)s\""
@@ -2012,7 +2014,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr "zařízení záznamu systému musí být jedno z: %s"
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, fuzzy, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr "Třída %(fullname)s je zastaralá: %(msg)s"
@@ -2084,18 +2086,18 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 #, fuzzy
 msgid "Full set of CONF:"
 msgstr "Úplná sada PŘÍZNAKŮ:"
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2801,7 +2803,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -3004,7 +3006,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3135,76 +3137,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, 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:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5921,22 +5923,9 @@ msgstr "skupina %s již existuje"
 msgid "Unexpected state while cloning %s"
 msgstr "Při spuštění příkazu došlo k nečekané chybě."
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-#~ "Přeskakování %(full_task_name)s, zbývá "
-#~ "%(ticks_to_skip)s tiků do dalšího spuštění"
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/da/LC_MESSAGES/cinder.po b/cinder/locale/da/LC_MESSAGES/cinder.po
index fd840ec0c0e5df09fd5a9f9ca7d3a573cd5f3b00..77aeb122cb058728197c1a44f603dd0bf0fa2800 100644 (file)
--- a/cinder/locale/da/LC_MESSAGES/cinder.po
+++ b/cinder/locale/da/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -590,35 +590,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -628,7 +628,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -643,12 +643,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -705,33 +705,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -788,7 +790,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1314,43 +1316,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1947,22 +1949,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1982,7 +1984,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2052,17 +2054,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2763,7 +2765,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2963,7 +2965,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3094,76 +3096,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "bind %s: slettet"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5863,20 +5865,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/de/LC_MESSAGES/cinder.po b/cinder/locale/de/LC_MESSAGES/cinder.po
index a9a7d7643195fd6150317b4d202470ebb54dc27a..9af30c75597f84ace1d852e01904a3daff054c6b 100644 (file)
--- a/cinder/locale/de/LC_MESSAGES/cinder.po
+++ b/cinder/locale/de/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -595,35 +595,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -633,7 +633,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -648,12 +648,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -698,7 +698,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr "Hole %s"
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -710,33 +710,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Führe Kommando (subprocess) aus: %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr "Ergebnis war %s"
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -793,7 +795,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1319,43 +1321,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1953,22 +1955,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1988,7 +1990,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2058,18 +2060,18 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 #, fuzzy
 msgid "Full set of CONF:"
 msgstr "Alle vorhandenen FLAGS:"
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2770,7 +2772,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2970,7 +2972,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3101,76 +3103,76 @@ msgstr "Volume %s: entferne Export"
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "Volume %s: erfolgreich entfernt"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5875,20 +5877,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr "Unerwarteter Fehler bei Ausführung des Kommandos."
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/en_AU/LC_MESSAGES/cinder.po b/cinder/locale/en_AU/LC_MESSAGES/cinder.po
index 710984f1a0a7984ee8da453295c8f110df3aefee..7de4406c39771aa6bf90a4242a214000d5204aa2 100644 (file)
--- a/cinder/locale/en_AU/LC_MESSAGES/cinder.po
+++ b/cinder/locale/en_AU/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -596,36 +596,36 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 #, fuzzy
 msgid "Unhandled exception"
 msgstr "Inner Exception: %s"
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, fuzzy, python-format
 msgid "Starting %d workers"
 msgstr "start address"
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -635,7 +635,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -650,12 +650,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr "NotFound raised: %s"
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -700,7 +700,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr "Fetching %s"
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -712,33 +712,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Running cmd (subprocess): %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr "Result was %s"
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Running cmd (SSH): %s"
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -795,7 +797,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1323,47 +1325,47 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 #, fuzzy
 msgid "Backup status must be available or error"
 msgstr "Volume status must be available"
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 #, fuzzy
 msgid "Volume to be backed up must be available"
 msgstr "Volume status must be available"
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 #, fuzzy
 msgid "Backup status must be available"
 msgstr "Volume status must be available"
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 #, fuzzy
 msgid "Volume to be restored to must be available"
 msgstr "Volume status must be available"
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1962,22 +1964,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1997,7 +1999,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2067,17 +2069,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2781,7 +2783,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2985,7 +2987,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3117,76 +3119,76 @@ msgstr "volume %s: removing export"
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: deleted successfully"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
-#, fuzzy, python-format
-msgid "snapshot %s: snapshot is busy"
-msgstr "instance %s: snapshotting"
+#: cinder/volume/manager.py:511
+#, python-format
+msgid "Cannot delete snapshot %s: snapshot is busy"
+msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, 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:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5897,20 +5899,9 @@ msgstr "group %s already exists"
 msgid "Unexpected state while cloning %s"
 msgstr "Unexpected error while running command."
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
-#~ msgstr ""
-
-#~ msgid "Error retrieving volume status: "
-#~ msgstr ""
+#~ msgid "snapshot %s: snapshot is busy"
+#~ msgstr "instance %s: snapshotting"
 

diff --git a/cinder/locale/en_GB/LC_MESSAGES/cinder.po b/cinder/locale/en_GB/LC_MESSAGES/cinder.po
index 3438693b7b2bd98f22179e183de6ef71d816737b..6dd9b6ec3292a00dd73a8f49cf0f09616810e883 100644 (file)
--- a/cinder/locale/en_GB/LC_MESSAGES/cinder.po
+++ b/cinder/locale/en_GB/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -600,36 +600,36 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 #, fuzzy
 msgid "Unhandled exception"
 msgstr "Inner Exception: %s"
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -639,7 +639,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -654,12 +654,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -704,7 +704,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr "Fetching %s"
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -716,33 +716,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Running cmd (subprocess): %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr "Result was %s"
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Running cmd (SSH): %s"
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -799,7 +801,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1326,47 +1328,47 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 #, fuzzy
 msgid "Backup status must be available or error"
 msgstr "Volume status must be available"
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 #, fuzzy
 msgid "Volume to be backed up must be available"
 msgstr "Volume status must be available"
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 #, fuzzy
 msgid "Backup status must be available"
 msgstr "Volume status must be available"
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 #, fuzzy
 msgid "Volume to be restored to must be available"
 msgstr "Volume status must be available"
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1964,22 +1966,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1999,7 +2001,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2069,18 +2071,18 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 #, fuzzy
 msgid "Full set of CONF:"
 msgstr "Full set of FLAGS:"
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2785,7 +2787,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2989,7 +2991,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3121,76 +3123,76 @@ msgstr "volume %s: removing export"
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: deleted successfully"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
-#, fuzzy, python-format
-msgid "snapshot %s: snapshot is busy"
-msgstr "instance %s: snapshotting"
+#: cinder/volume/manager.py:511
+#, python-format
+msgid "Cannot delete snapshot %s: snapshot is busy"
+msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5897,20 +5899,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr "Unexpected error while running command."
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
-#~ msgstr ""
-
-#~ msgid "Error retrieving volume status: "
-#~ msgstr ""
+#~ msgid "snapshot %s: snapshot is busy"
+#~ msgstr "instance %s: snapshotting"
 

diff --git a/cinder/locale/en_US/LC_MESSAGES/cinder.po b/cinder/locale/en_US/LC_MESSAGES/cinder.po
index dd9a1dc4564caec67dd3ebead000a010f90e6f52..543e1762d720974b3b401fe28fa6b92cd1e595bb 100644 (file)
--- a/cinder/locale/en_US/LC_MESSAGES/cinder.po
+++ b/cinder/locale/en_US/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -602,35 +602,35 @@ msgstr "Failed to roll back reservations %(reservations)s"
 msgid "SIGTERM received"
 msgstr "SIGTERM received"
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr "Parent process has died unexpectedly, exiting"
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr "Forking too fast, sleeping"
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr "Caught %s, exiting"
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr "Unhandled exception"
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr "Started child %d"
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr "Starting %d workers"
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr "Child %(pid)d killed by signal %(sig)d"
@@ -640,7 +640,7 @@ msgstr "Child %(pid)d killed by signal %(sig)d"
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr "Child %(pid)d exited with status %(code)d"
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr "pid %d not in child list"
@@ -655,12 +655,12 @@ msgstr "_wait_child %d"
 msgid "wait wrap.failed %s"
 msgstr "wait wrap.failed %s"
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "Caught %s, stopping children"
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "Waiting on %d children to exit"
@@ -705,7 +705,7 @@ msgstr "%(flag)s : FLAG SET "
 msgid "Fetching %s"
 msgstr "Fetching %s"
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr "Got unknown keyword args to utils.execute: %r"
@@ -720,33 +720,35 @@ msgstr ""
 "from cinder-rootwrap, and defaults to using sudo) is now deprecated. You "
 "should use the rootwrap_config option instead."
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Running cmd (subprocess): %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr "Result was %s"
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r failed. Retrying."
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Running cmd (SSH): %s"
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr "Environment not supported over SSH"
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr "process_input not supported over SSH"
 
@@ -803,7 +805,7 @@ msgstr "timefunc: '%(name)s' took %(total_time).2f secs"
 msgid "Could not remove tmpdir: %s"
 msgstr "Could not remove tmpdir: %s"
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr "Unknown byte multiplier: %s"
@@ -1338,28 +1340,28 @@ msgstr "Removing options '%(bad_options)s' from query"
 msgid "Removing options '%s' from query"
 msgstr "Removing options '%s' from query"
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr "Backup status must be available or error"
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr "Volume to be backed up must be available"
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr "Backup status must be available"
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr "Backup to be restored has invalid size"
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
@@ -1368,15 +1370,15 @@ msgstr ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr "Volume to be restored to must be available"
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr "Volume to be restored to is smaller than the backup to be restored"
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
@@ -2021,22 +2023,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr "Could not release the acquired lock `%s`"
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
@@ -2056,7 +2058,7 @@ msgstr "Error loading logging config %(log_config)s: %(err_msg)s"
 msgid "syslog facility must be one of: %s"
 msgstr "syslog facility must be one of: %s"
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr "Fatal call to deprecated config: %(msg)s"
@@ -2128,17 +2130,17 @@ msgstr "Inheritance-based rules are deprecated; update _check_%s"
 msgid "No handler for matches of kind %s"
 msgstr "No handler for matches of kind %s"
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr "Full set of CONF:"
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr "Child %(pid)s exited with status %(code)d"
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2872,7 +2874,7 @@ msgid "Volume in unexpected state"
 msgstr "Unexpected status code"
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr "status must be available"
 
@@ -3080,7 +3082,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3211,76 +3213,76 @@ msgstr "volume %s: removing export"
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
-msgstr "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
+msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr "Failed to update usages deleting volume"
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: deleted successfully"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr "snapshot %s: creating"
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr "snapshot %(snap_name)s: creating"
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, 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:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr "snapshot %s: deleting"
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
-msgstr "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
+msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr "Failed to update usages deleting snapshot"
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr "snapshot %s: deleted successfully"
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 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:617 cinder/volume/manager.py:622
 #, 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:627
 #, 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:646
 #, 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:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr "Clear capabilities"
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr "Notification {%s} received"
@@ -6272,25 +6274,9 @@ msgstr "Volume (%s) already exists on array"
 msgid "Unexpected state while cloning %s"
 msgstr "Unexpected state while cloning %s"
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
-#~ msgstr "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
-
-#~ msgid "Error retrieving volume status: "
-#~ msgstr "Error retrieving volume status: "
+#~ msgid "volume %s: volume is busy"
+#~ msgstr "volume %s: volume is busy"
+
+#~ msgid "snapshot %s: snapshot is busy"
+#~ msgstr "snapshot %s: snapshot is busy"
 

diff --git a/cinder/locale/es/LC_MESSAGES/cinder.po b/cinder/locale/es/LC_MESSAGES/cinder.po
index cabbcde742c29faa6661d0e76988f71329422946..b4f3647411166baa5e8330433142f8713c5b4026 100644 (file)
--- a/cinder/locale/es/LC_MESSAGES/cinder.po
+++ b/cinder/locale/es/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -602,36 +602,36 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 #, fuzzy
 msgid "Unhandled exception"
 msgstr "Excepción interna: %s"
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, fuzzy, python-format
 msgid "Starting %d workers"
 msgstr "configurando la red del host"
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -641,7 +641,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -656,12 +656,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr "No encontrado: %s"
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -706,7 +706,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr "Obteniendo %s"
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -718,33 +718,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Ejecutando cmd (subprocesos): %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr "El resultado fue %s"
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "corriendo cmd (SSH): %s"
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -801,7 +803,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1329,47 +1331,47 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 #, fuzzy
 msgid "Backup status must be available or error"
 msgstr "El estado del volumen debe estar disponible"
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 #, fuzzy
 msgid "Volume to be backed up must be available"
 msgstr "El estado del volumen debe estar disponible"
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 #, fuzzy
 msgid "Backup status must be available"
 msgstr "El estado del volumen debe estar disponible"
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 #, fuzzy
 msgid "Volume to be restored to must be available"
 msgstr "El estado del volumen debe estar disponible"
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1968,22 +1970,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -2003,7 +2005,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2073,18 +2075,18 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 #, fuzzy
 msgid "Full set of CONF:"
 msgstr "Conjunto completo de opciones (FLAGS):"
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2791,7 +2793,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2995,7 +2997,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3127,76 +3129,76 @@ msgstr "volumen %s: eliminando exportación"
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volumen %s: eliminado satisfactoriamente"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
-#, fuzzy, python-format
-msgid "snapshot %s: snapshot is busy"
-msgstr "instancia %s: creando snapshot"
+#: cinder/volume/manager.py:511
+#, python-format
+msgid "Cannot delete snapshot %s: snapshot is busy"
+msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5907,20 +5909,9 @@ msgstr "el grupo %s ya existe"
 msgid "Unexpected state while cloning %s"
 msgstr "Error inesperado mientras el comando se ejecutaba"
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
-#~ msgstr ""
-
-#~ msgid "Error retrieving volume status: "
-#~ msgstr ""
+#~ msgid "snapshot %s: snapshot is busy"
+#~ msgstr "instancia %s: creando snapshot"
 

diff --git a/cinder/locale/fi_FI/LC_MESSAGES/cinder.po b/cinder/locale/fi_FI/LC_MESSAGES/cinder.po
index 73be8a81ed07c818c99365a2d0a7ea2f18aa3302..2bb8ff323a49402a2e20df0982f824e77a6f85ec 100644 (file)
--- a/cinder/locale/fi_FI/LC_MESSAGES/cinder.po
+++ b/cinder/locale/fi_FI/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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) "
@@ -591,35 +591,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -644,12 +644,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -706,33 +706,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -789,7 +791,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1315,43 +1317,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1948,22 +1950,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1983,7 +1985,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2053,17 +2055,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2764,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2964,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3095,76 +3097,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5864,20 +5866,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/fr/LC_MESSAGES/cinder.po b/cinder/locale/fr/LC_MESSAGES/cinder.po
index 75342a86c925496e8a84e58a83c608444ff9d912..5157b1470b54eafdc2bf03236410ca91e072f778 100644 (file)
--- a/cinder/locale/fr/LC_MESSAGES/cinder.po
+++ b/cinder/locale/fr/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -602,36 +602,36 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 #, fuzzy
 msgid "Unhandled exception"
 msgstr "Exception interne : %s"
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, fuzzy, python-format
 msgid "Starting %d workers"
 msgstr "adresse de départ"
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -641,7 +641,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -656,12 +656,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr "\"Non trouvé\" remonté : %s"
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -706,7 +706,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr "Récupèration de %s"
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -718,33 +718,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Execution de la commande (sous-processus) : %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr "Le résultat était %s"
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Execution de la cmd (SSH): %s"
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -801,7 +803,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1329,47 +1331,47 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 #, fuzzy
 msgid "Backup status must be available or error"
 msgstr "Le status du volume doit être disponible"
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 #, fuzzy
 msgid "Volume to be backed up must be available"
 msgstr "Le status du volume doit être disponible"
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 #, fuzzy
 msgid "Backup status must be available"
 msgstr "Le status du volume doit être disponible"
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 #, fuzzy
 msgid "Volume to be restored to must be available"
 msgstr "Le status du volume doit être disponible"
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1968,22 +1970,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -2003,7 +2005,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2073,18 +2075,18 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 #, fuzzy
 msgid "Full set of CONF:"
 msgstr "Ensemble de propriétés complet :"
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2791,7 +2793,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2995,7 +2997,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3127,78 +3129,78 @@ msgstr "volume %s: suppression de l'exportation"
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: supprimé avec succès"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
-#, fuzzy, python-format
-msgid "snapshot %s: snapshot is busy"
-msgstr "instance %s: création d'un instantané (snapshot)"
+#: cinder/volume/manager.py:511
+#, python-format
+msgid "Cannot delete snapshot %s: snapshot is busy"
+msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, 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:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5913,20 +5915,9 @@ msgstr "le groupe %s existe déjà"
 msgid "Unexpected state while cloning %s"
 msgstr "Erreur imprévue lors de l'éxecution de la commande"
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
-#~ msgstr ""
-
-#~ msgid "Error retrieving volume status: "
-#~ msgstr ""
+#~ msgid "snapshot %s: snapshot is busy"
+#~ msgstr "instance %s: création d'un instantané (snapshot)"
 

diff --git a/cinder/locale/hr/LC_MESSAGES/cinder.po b/cinder/locale/hr/LC_MESSAGES/cinder.po
index 3abce422d90de903bde80edf214fea27870e4920..71d20ece9b88db61e59c91ffb42f215280ab7092 100644 (file)
--- a/cinder/locale/hr/LC_MESSAGES/cinder.po
+++ b/cinder/locale/hr/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Croatian "
@@ -592,35 +592,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -630,7 +630,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -645,12 +645,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -695,7 +695,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -707,33 +707,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -790,7 +792,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1316,43 +1318,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1949,22 +1951,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1984,7 +1986,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2054,17 +2056,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2765,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2965,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3096,76 +3098,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5865,20 +5867,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/hu/LC_MESSAGES/cinder.po b/cinder/locale/hu/LC_MESSAGES/cinder.po
index 5c0c2b2283ca9a31947cdfd84b2baa7d91170900..b0f342e34fbf0512b2d19d1c71491d814fd34bc5 100644 (file)
--- a/cinder/locale/hu/LC_MESSAGES/cinder.po
+++ b/cinder/locale/hu/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Hungarian "
@@ -591,35 +591,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -644,12 +644,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -706,33 +706,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -789,7 +791,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1315,43 +1317,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1948,22 +1950,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1983,7 +1985,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2053,17 +2055,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2764,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2964,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3095,76 +3097,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5864,20 +5866,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/id/LC_MESSAGES/cinder.po b/cinder/locale/id/LC_MESSAGES/cinder.po
index 1a3117efa280ec0a7f3dd98ea16008d95e50f13b..46b973d58f8aa5f62f3e5ce491a0e72604479f3e 100644 (file)
--- a/cinder/locale/id/LC_MESSAGES/cinder.po
+++ b/cinder/locale/id/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Indonesian "
@@ -591,35 +591,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -644,12 +644,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -706,33 +706,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -789,7 +791,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1315,43 +1317,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1948,22 +1950,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1983,7 +1985,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2053,17 +2055,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2764,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2964,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3095,76 +3097,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5864,20 +5866,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/it/LC_MESSAGES/cinder.po b/cinder/locale/it/LC_MESSAGES/cinder.po
index 85f69dbfb913c10e6c4acbd1419b4ab2621cfc3d..09b313f50d5d316ae0b1d20a4b38c8a06f2ca7c3 100644 (file)
--- a/cinder/locale/it/LC_MESSAGES/cinder.po
+++ b/cinder/locale/it/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -599,36 +599,36 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 #, fuzzy
 msgid "Unhandled exception"
 msgstr "Eccezione interna: %s"
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -638,7 +638,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -653,12 +653,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -703,7 +703,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr "Prelievo %s"
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -715,33 +715,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Esecuzione del comando (sottoprocesso): %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr "Il risultato é %s"
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Eseguendo cmd (SSH): %s"
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -798,7 +800,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1325,47 +1327,47 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 #, fuzzy
 msgid "Backup status must be available or error"
 msgstr "Lo stato del volume deve essere disponibile"
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 #, fuzzy
 msgid "Volume to be backed up must be available"
 msgstr "Lo stato del volume deve essere disponibile"
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 #, fuzzy
 msgid "Backup status must be available"
 msgstr "Lo stato del volume deve essere disponibile"
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 #, fuzzy
 msgid "Volume to be restored to must be available"
 msgstr "Lo stato del volume deve essere disponibile"
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1963,22 +1965,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1998,7 +2000,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2068,18 +2070,18 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 #, fuzzy
 msgid "Full set of CONF:"
 msgstr "Insieme di FLAGS:"
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2783,7 +2785,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2987,7 +2989,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3119,76 +3121,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: rimosso con successo"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
-#, fuzzy, python-format
-msgid "snapshot %s: snapshot is busy"
-msgstr "istanza %s: creazione snapshot in corso"
+#: cinder/volume/manager.py:511
+#, python-format
+msgid "Cannot delete snapshot %s: snapshot is busy"
+msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5897,20 +5899,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr "Si e' verificato un errore inatteso durante l'esecuzione del comando."
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
-#~ msgstr ""
-
-#~ msgid "Error retrieving volume status: "
-#~ msgstr ""
+#~ msgid "snapshot %s: snapshot is busy"
+#~ msgstr "istanza %s: creazione snapshot in corso"
 

diff --git a/cinder/locale/it_IT/LC_MESSAGES/cinder.po b/cinder/locale/it_IT/LC_MESSAGES/cinder.po
index 7ec8300a961f0eab910a250a3ce65bcf462e2eee..072282b69d0c21222261416fcafaf1139c64e956 100644 (file)
--- a/cinder/locale/it_IT/LC_MESSAGES/cinder.po
+++ b/cinder/locale/it_IT/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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) "
@@ -591,35 +591,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -644,12 +644,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -706,33 +706,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -789,7 +791,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1315,43 +1317,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1948,22 +1950,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1983,7 +1985,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2053,17 +2055,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2764,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2964,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3095,76 +3097,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5864,20 +5866,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/ja/LC_MESSAGES/cinder.po b/cinder/locale/ja/LC_MESSAGES/cinder.po
index aa6acd8c6417fe9a94955e22e0df99c2b43ca721..d6ea446c2f678c6c22896b216d6978865dbbd5be 100644 (file)
--- a/cinder/locale/ja/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ja/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -596,36 +596,36 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 #, fuzzy
 msgid "Unhandled exception"
 msgstr "内側で発生した例外： %s"
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, fuzzy, python-format
 msgid "Starting %d workers"
 msgstr "開始アドレス"
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -635,7 +635,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -650,12 +650,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr "NotFound 発生: %s"
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -700,7 +700,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr "ファイルをフェッチ： %s"
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -712,33 +712,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "コマンド実行(subprocess): %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr "コマンド実行結果： %s"
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "コマンド（SSH)を実行: %s"
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -795,7 +797,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1323,47 +1325,47 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 #, fuzzy
 msgid "Backup status must be available or error"
 msgstr "ボリュームのステータス(status)は available でなければなりません。"
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 #, fuzzy
 msgid "Volume to be backed up must be available"
 msgstr "ボリュームのステータス(status)は available でなければなりません。"
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 #, fuzzy
 msgid "Backup status must be available"
 msgstr "ボリュームのステータス(status)は available でなければなりません。"
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 #, fuzzy
 msgid "Volume to be restored to must be available"
 msgstr "ボリュームのステータス(status)は available でなければなりません。"
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1962,22 +1964,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1997,7 +1999,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2067,18 +2069,18 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 #, fuzzy
 msgid "Full set of CONF:"
 msgstr "FLAGSの一覧:"
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2782,7 +2784,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2986,7 +2988,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3118,76 +3120,76 @@ msgstr "ボリューム %s のエクスポートを解除します。"
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "ボリューム %s の削除に成功しました。"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
-#, fuzzy, python-format
-msgid "snapshot %s: snapshot is busy"
-msgstr "snapshotting: インスタンス %s のスナップショットを取得中"
+#: cinder/volume/manager.py:511
+#, python-format
+msgid "Cannot delete snapshot %s: snapshot is busy"
+msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, 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:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5898,20 +5900,9 @@ msgstr "グループ %s は既に存在しています。"
 msgid "Unexpected state while cloning %s"
 msgstr "コマンド実行において予期しないエラーが発生しました。"
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
-#~ msgstr ""
-
-#~ msgid "Error retrieving volume status: "
-#~ msgstr ""
+#~ msgid "snapshot %s: snapshot is busy"
+#~ msgstr "snapshotting: インスタンス %s のスナップショットを取得中"
 

diff --git a/cinder/locale/ka_GE/LC_MESSAGES/cinder.po b/cinder/locale/ka_GE/LC_MESSAGES/cinder.po
index 7c7893f1305e2db9c3518f4b7c40ea2bf4c66014..2d7ba9023fe6845f9875bf2a19c39d7480e16d5a 100644 (file)
--- a/cinder/locale/ka_GE/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ka_GE/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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) "
@@ -591,35 +591,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -644,12 +644,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -706,33 +706,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -789,7 +791,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1315,43 +1317,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1948,22 +1950,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1983,7 +1985,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2053,17 +2055,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2764,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2964,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3095,76 +3097,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5864,20 +5866,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/ko/LC_MESSAGES/cinder.po b/cinder/locale/ko/LC_MESSAGES/cinder.po
index 93ba8df29d59d6a2aa61639a492b0af9abb801a0..67c6e6d023124ffb07fc9f7770d46f5d68991c5f 100644 (file)
--- a/cinder/locale/ko/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ko/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -595,35 +595,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -633,7 +633,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -648,12 +648,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -698,7 +698,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -710,33 +710,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -793,7 +795,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1320,47 +1322,47 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 #, fuzzy
 msgid "Backup status must be available or error"
 msgstr "볼륨의 상태를 알 수 없습니다"
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 #, fuzzy
 msgid "Volume to be backed up must be available"
 msgstr "볼륨의 상태를 알 수 없습니다"
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 #, fuzzy
 msgid "Backup status must be available"
 msgstr "볼륨의 상태를 알 수 없습니다"
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 #, fuzzy
 msgid "Volume to be restored to must be available"
 msgstr "볼륨의 상태를 알 수 없습니다"
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1958,22 +1960,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1993,7 +1995,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2063,17 +2065,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2774,7 +2776,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2978,7 +2980,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3109,76 +3111,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
-#, fuzzy, python-format
-msgid "snapshot %s: snapshot is busy"
-msgstr "인스턴스 %s: 스냅샷 저장중"
+#: cinder/volume/manager.py:511
+#, python-format
+msgid "Cannot delete snapshot %s: snapshot is busy"
+msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5884,20 +5886,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr "명령 실행도중 예측하지 못한 에러가 발생했습니다"
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
-#~ msgstr ""
-
-#~ msgid "Error retrieving volume status: "
-#~ msgstr ""
+#~ msgid "snapshot %s: snapshot is busy"
+#~ msgstr "인스턴스 %s: 스냅샷 저장중"
 

diff --git a/cinder/locale/ko_KR/LC_MESSAGES/cinder.po b/cinder/locale/ko_KR/LC_MESSAGES/cinder.po
index a6bfed7c8bb30438a833bef4b066d4c6118c139e..6addecda11260990af0b8d64ba71b0f065b8666b 100644 (file)
--- a/cinder/locale/ko_KR/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ko_KR/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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) "
@@ -591,35 +591,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -644,12 +644,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -706,33 +706,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -789,7 +791,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1315,43 +1317,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1948,22 +1950,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1983,7 +1985,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2053,17 +2055,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2764,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2964,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3095,76 +3097,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5864,20 +5866,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/ms/LC_MESSAGES/cinder.po b/cinder/locale/ms/LC_MESSAGES/cinder.po
index ce2a720213678b7a5c83db4bfeb44f35b8030847..7246e985c25f82209facd643463b79dd1a319e65 100644 (file)
--- a/cinder/locale/ms/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ms/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Malay "
@@ -591,35 +591,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -644,12 +644,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -706,33 +706,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -789,7 +791,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1315,43 +1317,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1948,22 +1950,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1983,7 +1985,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2053,17 +2055,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2764,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2964,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3095,76 +3097,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5864,20 +5866,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/nb/LC_MESSAGES/cinder.po b/cinder/locale/nb/LC_MESSAGES/cinder.po
index 9d46418e9e620abfa857050cb270435dec90879b..8c65e94afe6969b3c03ad2f18347476f4c9d1c86 100644 (file)
--- a/cinder/locale/nb/LC_MESSAGES/cinder.po
+++ b/cinder/locale/nb/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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 "
@@ -591,35 +591,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -644,12 +644,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -706,33 +706,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -789,7 +791,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1315,43 +1317,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1948,22 +1950,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1983,7 +1985,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2053,17 +2055,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2764,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2964,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3095,76 +3097,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5864,20 +5866,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/nl_NL/LC_MESSAGES/cinder.po b/cinder/locale/nl_NL/LC_MESSAGES/cinder.po
index 3558ac1b73b286e6e26ce4c3e6b5180469ae594d..7ab7b8fbf07ea3c01cdce6792463b91699037585 100644 (file)
--- a/cinder/locale/nl_NL/LC_MESSAGES/cinder.po
+++ b/cinder/locale/nl_NL/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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) "
@@ -591,35 +591,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -644,12 +644,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -706,33 +706,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -789,7 +791,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1315,43 +1317,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1948,22 +1950,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1983,7 +1985,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2053,17 +2055,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2764,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2964,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3095,76 +3097,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5864,20 +5866,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/pt/LC_MESSAGES/cinder.po b/cinder/locale/pt/LC_MESSAGES/cinder.po
index 33fee6bc1248f48b17c68c1f144c1a6eaa3bf17d..95500e87e3512b892306affd421545fe435c01f7 100644 (file)
--- a/cinder/locale/pt/LC_MESSAGES/cinder.po
+++ b/cinder/locale/pt/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 18:10+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese "
@@ -591,35 +591,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -644,12 +644,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -706,33 +706,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -789,7 +791,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1315,43 +1317,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1948,22 +1950,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1983,7 +1985,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2053,17 +2055,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2764,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2964,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3095,76 +3097,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5864,20 +5866,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/pt_BR/LC_MESSAGES/cinder.po b/cinder/locale/pt_BR/LC_MESSAGES/cinder.po
index 8467c351bb06bcc36fe62d78a657c1f91514ff65..64e485781904d9803df58b87a3175724ffa472f3 100644 (file)
--- a/cinder/locale/pt_BR/LC_MESSAGES/cinder.po
+++ b/cinder/locale/pt_BR/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -597,36 +597,36 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 #, fuzzy
 msgid "Unhandled exception"
 msgstr "Exceção interna: %s"
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -636,7 +636,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -651,12 +651,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr "NotFound lançado: %s"
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -701,7 +701,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr "Buscando %s"
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -713,33 +713,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Executando comando (subprocesso): %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr "Resultado foi %s"
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Executando o comando (SSH): %s"
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -796,7 +798,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1323,47 +1325,47 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 #, fuzzy
 msgid "Backup status must be available or error"
 msgstr "O status do volume parece estar disponível"
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 #, fuzzy
 msgid "Volume to be backed up must be available"
 msgstr "O status do volume parece estar disponível"
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 #, fuzzy
 msgid "Backup status must be available"
 msgstr "O status do volume parece estar disponível"
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 #, fuzzy
 msgid "Volume to be restored to must be available"
 msgstr "O status do volume parece estar disponível"
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1961,22 +1963,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1996,7 +1998,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2066,18 +2068,18 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 #, fuzzy
 msgid "Full set of CONF:"
 msgstr "Conjunto completo de FLAGS:"
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2780,7 +2782,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2984,7 +2986,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3116,76 +3118,76 @@ msgstr "volume %s: removendo export"
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: remoção realizada com sucesso"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
-#, fuzzy, python-format
-msgid "snapshot %s: snapshot is busy"
-msgstr "instância %s: fazendo um snapshot"
+#: cinder/volume/manager.py:511
+#, python-format
+msgid "Cannot delete snapshot %s: snapshot is busy"
+msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5895,20 +5897,9 @@ msgstr "group %s já existe"
 msgid "Unexpected state while cloning %s"
 msgstr "Erro inesperado ao executar o comando."
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
-#~ msgstr ""
-
-#~ msgid "Error retrieving volume status: "
-#~ msgstr ""
+#~ msgid "snapshot %s: snapshot is busy"
+#~ msgstr "instância %s: fazendo um snapshot"
 

diff --git a/cinder/locale/ro/LC_MESSAGES/cinder.po b/cinder/locale/ro/LC_MESSAGES/cinder.po
index 5b673819d3f15a3429523c0adc9e6096ca19c6c1..bd9b6d7e798f097e16751c3d82b533302a908129 100644 (file)
--- a/cinder/locale/ro/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ro/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 18:10+0000\n"
 "PO-Revision-Date: 2013-06-12 07:55+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Romanian "
@@ -592,35 +592,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -630,7 +630,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -645,12 +645,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -695,7 +695,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -707,33 +707,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -790,7 +792,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1316,43 +1318,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1949,22 +1951,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1984,7 +1986,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2054,17 +2056,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2765,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2965,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3096,76 +3098,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5865,3 +5867,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
+#~ msgid "volume %s: volume is busy"
+#~ msgstr ""
+
+#~ msgid "snapshot %s: snapshot is busy"
+#~ msgstr ""
+

diff --git a/cinder/locale/ru/LC_MESSAGES/cinder.po b/cinder/locale/ru/LC_MESSAGES/cinder.po
index e870a8261fa7fa6412c9d4ef41aa91c118428929..e7a48b376da09c1ccdceccc44bbf8a5d34b57b23 100644 (file)
--- a/cinder/locale/ru/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ru/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -606,36 +606,36 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, fuzzy, python-format
 msgid "Caught %s, exiting"
 msgstr "снимок %s: удаление"
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 #, fuzzy
 msgid "Unhandled exception"
 msgstr "Вложенное исключение: %s"
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, fuzzy, python-format
 msgid "Starting %d workers"
 msgstr "установка сетевого узла"
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -645,7 +645,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -660,12 +660,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -710,7 +710,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr "Получение %s"
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr "Приняты неизвестные аргументы ключевого слова для utils.execute: %r"
@@ -722,33 +722,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Выполнение команды (субпроцесс): %s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr "Результат %s"
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r ошибка. Выполняется повтор."
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Выполнение команды (SSH): %s"
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr "Среда не поддерживается с использованием SSH"
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr "process_input не поддерживается с использованием SSH"
 
@@ -806,7 +808,7 @@ msgstr "timefunc: '%(name)s' заняла %(total_time).2f с."
 msgid "Could not remove tmpdir: %s"
 msgstr "Ошибка удаления контейнера: %s"
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1341,47 +1343,47 @@ msgstr "Удаление параметров '%(unk_opt_str)s' из запро
 msgid "Removing options '%s' from query"
 msgstr "Удаление параметров '%(unk_opt_str)s' из запроса"
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 #, fuzzy
 msgid "Backup status must be available or error"
 msgstr "Состояние тома должно быть доступно"
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 #, fuzzy
 msgid "Volume to be backed up must be available"
 msgstr "Состояние тома должно быть доступно"
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 #, fuzzy
 msgid "Backup status must be available"
 msgstr "Состояние тома должно быть доступно"
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 #, fuzzy
 msgid "Volume to be restored to must be available"
 msgstr "Состояние тома должно быть доступно"
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1980,22 +1982,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -2015,7 +2017,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, fuzzy, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr "Класс %(fullname)s устарел: %(msg)s"
@@ -2085,18 +2087,18 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 #, fuzzy
 msgid "Full set of CONF:"
 msgstr "Полный набор ФЛАГОВ:"
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2817,7 +2819,7 @@ msgid "Volume in unexpected state"
 msgstr "Непредвиденный код состояния"
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -3022,7 +3024,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3155,77 +3157,77 @@ msgstr "том %s: удаление экспортирования"
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
-msgstr "том %s: том занят"
+msgid "Cannot delete volume %s: volume is busy"
+msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 #, fuzzy
 msgid "Failed to update usages deleting volume"
 msgstr "Ошибка обновления агента: %(resp)r"
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "том %s: удаление завершено"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr "снимок %s: создание"
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr "снимок %(snap_name)s: создание"
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr "снимок %s: создание завершено"
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr "снимок %s: удаление"
 
-#: cinder/volume/manager.py:510
-#, fuzzy, python-format
-msgid "snapshot %s: snapshot is busy"
-msgstr "снимок %s: создание завершено"
+#: cinder/volume/manager.py:511
+#, python-format
+msgid "Cannot delete snapshot %s: snapshot is busy"
+msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr "снимок %s: удаление выполнено"
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, 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:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr "Очистить возможности"
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr "Принято уведомление {%s}"
@@ -5951,26 +5953,9 @@ msgstr "группа %s уже существует"
 msgid "Unexpected state while cloning %s"
 msgstr "Неожиданная ошибка при выполнении команды."
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-#~ "Пропуск %(full_task_name)s, %(ticks_to_skip)s раз"
-#~ " осталось, для произведения следующего "
-#~ "запуска"
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-#~ "Том ISCSI не найден в: %(mount_device)s."
-#~ " Будет выполнена повторная проверка и "
-#~ "попытка.  Повторение: %(tries)s"
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
-#~ msgstr "Найден узел iSCSI %(mount_device)s (после %(tries)s повторных проверок)"
-
-#~ msgid "Error retrieving volume status: "
-#~ msgstr ""
+#~ msgid "volume %s: volume is busy"
+#~ msgstr "том %s: том занят"
+
+#~ msgid "snapshot %s: snapshot is busy"
+#~ msgstr "снимок %s: создание завершено"
 

diff --git a/cinder/locale/ru_RU/LC_MESSAGES/cinder.po b/cinder/locale/ru_RU/LC_MESSAGES/cinder.po
index b4cbaea79da7a51e460b7350d8674055449a6fe0..ff15347f71a9fdb13f1d4a05aa2f743882508de8 100644 (file)
--- a/cinder/locale/ru_RU/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ru_RU/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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) "
@@ -592,35 +592,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -630,7 +630,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -645,12 +645,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -695,7 +695,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -707,33 +707,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -790,7 +792,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1316,43 +1318,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1949,22 +1951,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1984,7 +1986,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2054,17 +2056,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2765,7 +2767,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2965,7 +2967,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3096,76 +3098,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5865,20 +5867,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/sw_KE/LC_MESSAGES/cinder.po b/cinder/locale/sw_KE/LC_MESSAGES/cinder.po
index 106245cf37a13b8380b268b4e2be3ff0119a986c..67ce67a93bea47b45efe4043b3a76be03af0457a 100644 (file)
--- a/cinder/locale/sw_KE/LC_MESSAGES/cinder.po
+++ b/cinder/locale/sw_KE/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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) "
@@ -591,35 +591,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -644,12 +644,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -706,33 +706,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -789,7 +791,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1315,43 +1317,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1948,22 +1950,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1983,7 +1985,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2053,17 +2055,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2764,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2964,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3095,76 +3097,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5864,20 +5866,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/tl/LC_MESSAGES/cinder.po b/cinder/locale/tl/LC_MESSAGES/cinder.po
index 450ebc2de0ae4894e772238753e98944b2bf70d5..5e2780b9bbbefd95b185d60a73d2bf3b5a5b89b4 100644 (file)
--- a/cinder/locale/tl/LC_MESSAGES/cinder.po
+++ b/cinder/locale/tl/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -590,35 +590,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -628,7 +628,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -643,12 +643,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -705,33 +705,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -788,7 +790,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1314,43 +1316,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1947,22 +1949,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1982,7 +1984,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2052,17 +2054,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2763,7 +2765,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2963,7 +2965,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3094,76 +3096,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5865,20 +5867,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr "Merong hindi-inaasahang pagkakamali habang tumatakbo ang command."
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/tr/LC_MESSAGES/cinder.po b/cinder/locale/tr/LC_MESSAGES/cinder.po
index e5ba4fe0389174d04c9b3b6b49d558ad6c514cc4..b7ed6de2bc495f57bf56ee6ee5d32d84bdece299 100644 (file)
--- a/cinder/locale/tr/LC_MESSAGES/cinder.po
+++ b/cinder/locale/tr/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -590,35 +590,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -628,7 +628,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -643,12 +643,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -693,7 +693,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -705,33 +705,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -788,7 +790,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1314,43 +1316,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1947,22 +1949,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1982,7 +1984,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2052,17 +2054,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2763,7 +2765,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2963,7 +2965,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3094,76 +3096,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5863,20 +5865,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/tr_TR/LC_MESSAGES/cinder.po b/cinder/locale/tr_TR/LC_MESSAGES/cinder.po
index ece49f3844d82fc9b98fa01f7c108f793b732dad..2d12baf2c7ea3251e9bd2db88e19d355899ea3d6 100644 (file)
--- a/cinder/locale/tr_TR/LC_MESSAGES/cinder.po
+++ b/cinder/locale/tr_TR/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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) "
@@ -591,35 +591,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -644,12 +644,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -706,33 +706,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -789,7 +791,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1315,43 +1317,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1948,22 +1950,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1983,7 +1985,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2053,17 +2055,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2764,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2964,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3095,76 +3097,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5864,20 +5866,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/uk/LC_MESSAGES/cinder.po b/cinder/locale/uk/LC_MESSAGES/cinder.po
index cb3fd53e6f0614fe346ed32b4069895665aad6c0..c0ae166367726601961b745a450158077c0bf159 100644 (file)
--- a/cinder/locale/uk/LC_MESSAGES/cinder.po
+++ b/cinder/locale/uk/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -591,35 +591,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -644,12 +644,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -706,33 +706,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -789,7 +791,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1315,43 +1317,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1948,22 +1950,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1983,7 +1985,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2053,17 +2055,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2764,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2964,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3095,76 +3097,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5866,20 +5868,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr "Неочікувана помилка при виконанні команди."
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/vi_VN/LC_MESSAGES/cinder.po b/cinder/locale/vi_VN/LC_MESSAGES/cinder.po
index d0821d9e1b7efc38ce2bd65781d45f472dca36fa..5c4c442bb519ea4d694ae40d5a6b32eb39a05cdd 100644 (file)
--- a/cinder/locale/vi_VN/LC_MESSAGES/cinder.po
+++ b/cinder/locale/vi_VN/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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) "
@@ -591,35 +591,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -644,12 +644,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -706,33 +706,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -789,7 +791,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1315,43 +1317,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1948,22 +1950,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1983,7 +1985,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2053,17 +2055,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2764,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2964,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3095,76 +3097,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5864,20 +5866,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/zh_CN/LC_MESSAGES/cinder.po b/cinder/locale/zh_CN/LC_MESSAGES/cinder.po
index 5bfae363c3d8916121c204aae5a7b9d497962323..3fbdf7a083267ee1399cdab11c062479af2c906e 100644 (file)
--- a/cinder/locale/zh_CN/LC_MESSAGES/cinder.po
+++ b/cinder/locale/zh_CN/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -601,36 +601,36 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, fuzzy, python-format
 msgid "Caught %s, exiting"
 msgstr "快照 %s：正在删除"
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 #, fuzzy
 msgid "Unhandled exception"
 msgstr "内层异常：%s"
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, fuzzy, python-format
 msgid "Starting %d workers"
 msgstr "起始地址"
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -640,7 +640,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -655,12 +655,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr "未知的基文件：%s"
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -705,7 +705,7 @@ msgstr "%(flag)s：标记集合 "
 msgid "Fetching %s"
 msgstr "正在抓取 %s"
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr "发现未知的 utils.execute 关键字参数：%r"
@@ -717,33 +717,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "正在运行cmd (subprocess)：%s"
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr "运行结果为 %s"
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r 失败，重试。"
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "运行cmd (SSH)：%s"
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr "SSH上不支持环境变量"
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr "SSH上不支持的进程输入参数。"
 
@@ -801,7 +803,7 @@ msgstr "timefunc：'%(name)s' 用了%(total_time).2f 秒"
 msgid "Could not remove tmpdir: %s"
 msgstr "移除容器失败：%s"
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, fuzzy, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr "未知的基文件：%s"
@@ -1332,47 +1334,47 @@ msgstr "正在从查询语句中移除选项 '%(unk_opt_str)s'"
 msgid "Removing options '%s' from query"
 msgstr "正在从查询语句中移除选项 '%(unk_opt_str)s'"
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 #, fuzzy
 msgid "Backup status must be available or error"
 msgstr "卷组状态必须可获取"
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 #, fuzzy
 msgid "Volume to be backed up must be available"
 msgstr "卷组状态必须可获取"
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 #, fuzzy
 msgid "Backup status must be available"
 msgstr "状态必须可用"
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 #, fuzzy
 msgid "Volume to be restored to must be available"
 msgstr "卷组状态必须可获取"
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, fuzzy, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr "正在把卷 %(volume_id)s 附加到 %(mountpoint)s"
@@ -1978,22 +1980,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, fuzzy, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "获得信号量 \"%(lock)s\" 为方法 \"%(method)s\" ...锁"
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, fuzzy, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "正在 试图获取锁 \"%(lock)s\" 为方法 \"%(method)s\"...锁"
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, fuzzy, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr "获得文件锁 \"%(lock)s\" 为方法 \"%(method)s\"...锁"
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, fuzzy, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr "获得文件锁 \"%(lock)s\" 为方法 \"%(method)s\"...锁"
@@ -2013,7 +2015,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr "syslog设备必须作为一个 %s 。"
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, fuzzy, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr "类 %(fullname)s 是不推荐的：%(msg)s"
@@ -2085,18 +2087,18 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 #, fuzzy
 msgid "Full set of CONF:"
 msgstr "标记全集："
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2817,7 +2819,7 @@ msgid "Volume in unexpected state"
 msgstr "意外的状态码"
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr "状态必须可用"
 
@@ -3024,7 +3026,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3157,77 +3159,77 @@ msgstr "卷%s：正在移除导出"
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
-msgstr "卷 %s：卷繁忙"
+msgid "Cannot delete volume %s: volume is busy"
+msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 #, fuzzy
 msgid "Failed to update usages deleting volume"
 msgstr "更新代理失败：%(resp)r"
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "卷%s：删除成功"
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr "快照 %s：正在创建"
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr "快照 %(snap_name)s：正在创建"
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr "快照 %s：创建成功"
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr "快照 %s：正在删除"
 
-#: cinder/volume/manager.py:510
-#, fuzzy, python-format
-msgid "snapshot %s: snapshot is busy"
-msgstr "快照 %s：创建成功"
+#: cinder/volume/manager.py:511
+#, python-format
+msgid "Cannot delete snapshot %s: snapshot is busy"
+msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr "快照 %s：删除成功"
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, 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:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr "清理能力"
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr "收到通知 {%s}"
@@ -5953,20 +5955,9 @@ msgstr "安全组 %s 已经存在"
 msgid "Unexpected state while cloning %s"
 msgstr "运行命令时出现意外错误"
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr "跳过 %(full_task_name)s，到下次运行还剩下%(ticks_to_skip)s 跳。"
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr "在 %(mount_device)s 上还没有找到iSCSI卷。将再次扫描并重试。尝试次数：%(tries)s"
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
-#~ msgstr "找到iSCSI节点 %(mount_device)s （经过%(tries)s 次再扫描）"
+#~ msgid "volume %s: volume is busy"
+#~ msgstr "卷 %s：卷繁忙"
 
-#~ msgid "Error retrieving volume status: "
-#~ msgstr ""
+#~ msgid "snapshot %s: snapshot is busy"
+#~ msgstr "快照 %s：创建成功"
 

diff --git a/cinder/locale/zh_HK/LC_MESSAGES/cinder.po b/cinder/locale/zh_HK/LC_MESSAGES/cinder.po
index dfa17efc0970012614e47d32a965414952695291..53d63fbedeaecbe6327e703561edd567a898a90a 100644 (file)
--- a/cinder/locale/zh_HK/LC_MESSAGES/cinder.po
+++ b/cinder/locale/zh_HK/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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) "
@@ -591,35 +591,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -629,7 +629,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -644,12 +644,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -694,7 +694,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -706,33 +706,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -789,7 +791,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1315,43 +1317,43 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 msgid "Backup status must be available or error"
 msgstr ""
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 msgid "Volume to be backed up must be available"
 msgstr ""
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 msgid "Backup status must be available"
 msgstr ""
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 msgid "Volume to be restored to must be available"
 msgstr ""
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1948,22 +1950,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1983,7 +1985,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2053,17 +2055,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2764,7 +2766,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2964,7 +2966,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3095,76 +3097,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5864,20 +5866,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr ""
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""
 

diff --git a/cinder/locale/zh_TW/LC_MESSAGES/cinder.po b/cinder/locale/zh_TW/LC_MESSAGES/cinder.po
index f034505336e32478d77d0977b70f469bfa073a81..cface9abae20d4a011bb8dadfc22a9e7f8f719c1 100644 (file)
--- a/cinder/locale/zh_TW/LC_MESSAGES/cinder.po
+++ b/cinder/locale/zh_TW/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-12 18:09+0000\n"
+"POT-Creation-Date: 2013-06-13 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"
@@ -599,35 +599,35 @@ msgstr ""
 msgid "SIGTERM received"
 msgstr ""
 
-#: cinder/service.py:174 cinder/openstack/common/service.py:164
+#: cinder/service.py:174 cinder/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: cinder/service.py:213 cinder/openstack/common/service.py:200
+#: cinder/service.py:213 cinder/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: cinder/service.py:231 cinder/openstack/common/service.py:121
-#: cinder/openstack/common/service.py:218
+#: cinder/service.py:231 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: cinder/service.py:236 cinder/openstack/common/service.py:223
+#: cinder/service.py:236 cinder/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: cinder/service.py:243 cinder/openstack/common/service.py:230
+#: cinder/service.py:243 cinder/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: cinder/service.py:253 cinder/openstack/common/service.py:240
+#: cinder/service.py:253 cinder/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: cinder/service.py:272 cinder/openstack/common/service.py:257
+#: cinder/service.py:272 cinder/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
@@ -637,7 +637,7 @@ msgstr ""
 msgid "Child %(pid)d exited with status %(code)d"
 msgstr ""
 
-#: cinder/service.py:278 cinder/openstack/common/service.py:265
+#: cinder/service.py:278 cinder/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
@@ -652,12 +652,12 @@ msgstr ""
 msgid "wait wrap.failed %s"
 msgstr ""
 
-#: cinder/service.py:310 cinder/openstack/common/service.py:293
+#: cinder/service.py:310 cinder/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: cinder/service.py:321 cinder/openstack/common/service.py:304
+#: cinder/service.py:321 cinder/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -702,7 +702,7 @@ msgstr ""
 msgid "Fetching %s"
 msgstr ""
 
-#: cinder/utils.py:147 cinder/openstack/common/processutils.py:122
+#: cinder/utils.py:147 cinder/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
@@ -714,33 +714,35 @@ msgid ""
 "should use the rootwrap_config option instead."
 msgstr ""
 
-#: cinder/utils.py:169 cinder/openstack/common/processutils.py:137
+#: cinder/utils.py:169 cinder/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
 #: cinder/utils.py:186 cinder/utils.py:267
-#: cinder/openstack/common/processutils.py:162
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:279
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: cinder/utils.py:199 cinder/openstack/common/processutils.py:174
+#: cinder/utils.py:199 cinder/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: cinder/utils.py:241 cinder/volume/drivers/san/hp/hp_3par_common.py:252
+#: cinder/utils.py:241 cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:252
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: cinder/utils.py:243
+#: cinder/utils.py:243 cinder/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: cinder/utils.py:247
+#: cinder/utils.py:247 cinder/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
@@ -797,7 +799,7 @@ msgstr ""
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: cinder/utils.py:1162
+#: cinder/utils.py:1162 cinder/openstack/common/strutils.py:186
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
@@ -1323,47 +1325,47 @@ msgstr ""
 msgid "Removing options '%s' from query"
 msgstr ""
 
-#: cinder/backup/api.py:53
+#: cinder/backup/api.py:65
 #, fuzzy
 msgid "Backup status must be available or error"
 msgstr "Volume 狀態需要可被使用"
 
-#: cinder/backup/api.py:78
+#: cinder/backup/api.py:92
 #, fuzzy
 msgid "Volume to be backed up must be available"
 msgstr "Volume 狀態需要可被使用"
 
-#: cinder/backup/api.py:112
+#: cinder/backup/api.py:127
 #, fuzzy
 msgid "Backup status must be available"
 msgstr "Volume 狀態需要可被使用"
 
-#: cinder/backup/api.py:117
+#: cinder/backup/api.py:132
 msgid "Backup to be restored has invalid size"
 msgstr ""
 
-#: cinder/backup/api.py:126
+#: cinder/backup/api.py:141
 #, python-format
 msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:140
+#: cinder/backup/api.py:155
 #, python-format
 msgid ""
 "volume size %(volume_size)d is too small to restore backup of size "
 "%(size)d."
 msgstr ""
 
-#: cinder/backup/api.py:145
+#: cinder/backup/api.py:160
 #, fuzzy
 msgid "Volume to be restored to must be available"
 msgstr "Volume 狀態需要可被使用"
 
-#: cinder/backup/api.py:151
+#: cinder/backup/api.py:166
 msgid "Volume to be restored to is smaller than the backup to be restored"
 msgstr ""
 
-#: cinder/backup/api.py:155
+#: cinder/backup/api.py:170
 #, python-format
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
@@ -1961,22 +1963,22 @@ msgstr ""
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:188
+#: cinder/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:199
+#: cinder/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:226
+#: cinder/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/lockutils.py:234
+#: cinder/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -1996,7 +1998,7 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:555
+#: cinder/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2066,17 +2068,17 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:112
-#: cinder/openstack/common/service.py:275
+#: cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: cinder/openstack/common/service.py:261
+#: cinder/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: cinder/openstack/common/strutils.py:72
+#: cinder/openstack/common/strutils.py:86
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
@@ -2779,7 +2781,7 @@ msgid "Volume in unexpected state"
 msgstr ""
 
 #: cinder/transfer/api.py:102 cinder/volume/api.py:106 cinder/volume/api.py:480
-#: cinder/volume/manager.py:559
+#: cinder/volume/manager.py:561
 msgid "status must be available"
 msgstr ""
 
@@ -2983,7 +2985,7 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:526 cinder/volume/manager.py:711
+#: cinder/volume/driver.py:526 cinder/volume/manager.py:713
 #: cinder/volume/drivers/lvm.py:562 cinder/volume/drivers/lvm.py:686
 #: cinder/volume/drivers/storwize_svc.py:1348
 #: cinder/volume/drivers/emc/emc_smis_common.py:857
@@ -3114,76 +3116,76 @@ msgstr ""
 
 #: cinder/volume/manager.py:427
 #, python-format
-msgid "volume %s: volume is busy"
+msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:446
+#: cinder/volume/manager.py:447
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:450
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:465
+#: cinder/volume/manager.py:466
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:471
+#: cinder/volume/manager.py:472
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:489
+#: cinder/volume/manager.py:490
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:497 cinder/volume/manager.py:507
+#: cinder/volume/manager.py:498 cinder/volume/manager.py:508
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:510
+#: cinder/volume/manager.py:511
 #, python-format
-msgid "snapshot %s: snapshot is busy"
+msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:535
+#: cinder/volume/manager.py:537
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:538
+#: cinder/volume/manager.py:540
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:556
+#: cinder/volume/manager.py:558
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:615 cinder/volume/manager.py:620
+#: cinder/volume/manager.py:617 cinder/volume/manager.py:622
 #, 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:627
 #, python-format
 msgid "Downloaded image %(image_id)s to %(volume_id)s successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:644
+#: cinder/volume/manager.py:646
 #, python-format
 msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:724
+#: cinder/volume/manager.py:726
 msgid "Clear capabilities"
 msgstr ""
 
-#: cinder/volume/manager.py:728
+#: cinder/volume/manager.py:730
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -5890,20 +5892,9 @@ msgstr ""
 msgid "Unexpected state while cloning %s"
 msgstr "非預期的執行錯誤"
 
-#~ msgid ""
-#~ "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks"
-#~ " left until next run"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "ISCSI volume not yet found at: "
-#~ "%(host_device)s. Will rescan & retry.  "
-#~ "Try number: %(tries)s"
-#~ msgstr ""
-
-#~ msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+#~ msgid "volume %s: volume is busy"
 #~ msgstr ""
 
-#~ msgid "Error retrieving volume status: "
+#~ msgid "snapshot %s: snapshot is busy"
 #~ msgstr ""