163 files changed, 51431 insertions, 27103 deletions

diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index 7ce18685b..dfe015456 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -78,7 +78,7 @@ CONF.import_opt('use_forwarded_for', 'nova.api.auth')
 
 def ec2_error(req, request_id, code, message):
     """Helper to send an ec2_compatible error."""
-    LOG.error(_('%(code)s: %(message)s') % locals())
+    LOG.error(_('%(code)s: %(message)s'), {'code': code, 'message': message})
     resp = webob.Response()
     resp.status = 400
     resp.headers['Content-Type'] = 'text/xml'
@@ -180,11 +180,12 @@ class Lockout(wsgi.Middleware):
                 # NOTE(vish): To use incr, failures has to be a string.
                 self.mc.set(failures_key, '1', time=CONF.lockout_window * 60)
             elif failures >= CONF.lockout_attempts:
-                lock_mins = CONF.lockout_minutes
-                msg = _('Access key %(access_key)s has had %(failures)d'
-                        ' failed authentications and will be locked out'
-                        ' for %(lock_mins)d minutes.') % locals()
-                LOG.warn(msg)
+                LOG.warn(_('Access key %(access_key)s has had %(failures)d '
+                           'failed authentications and will be locked out '
+                           'for %(lock_mins)d minutes.'),
+                         {'access_key': access_key,
+                          'failures': failures,
+                          'lock_mins': CONF.lockout_minutes})
                 self.mc.set(failures_key, str(failures),
                             time=CONF.lockout_minutes * 60)
         return res
@@ -333,7 +334,8 @@ class Requestify(wsgi.Middleware):
 
         LOG.debug(_('action: %s'), action)
         for key, value in args.items():
-            LOG.debug(_('arg: %(key)s\t\tval: %(value)s') % locals())
+            LOG.debug(_('arg: %(key)s\t\tval: %(value)s'),
+                      {'key': key, 'value': value})
 
         # Success!
         api_request = apirequest.APIRequest(self.controller, action,
@@ -409,7 +411,9 @@ class Authorizer(wsgi.Middleware):
             return self.application
         else:
             LOG.audit(_('Unauthorized request for controller=%(controller)s '
-                        'and action=%(action)s') % locals(), context=context)
+                        'and action=%(action)s'),
+                      {'controller': controller, 'action': action},
+                      context=context)
             raise webob.exc.HTTPUnauthorized()
 
     def _matches_any_role(self, context, roles):
@@ -501,8 +505,6 @@ class Executor(wsgi.Application):
             LOG.info(_('NotFound raised: %s'), unicode(ex), context=context)
             return ec2_error(req, request_id, type(ex).__name__, unicode(ex))
         except exception.EC2APIError as ex:
-            LOG.exception(_('EC2APIError raised: %s'), unicode(ex),
-                          context=context)
             if ex.code:
                 return ec2_error(req, request_id, ex.code, unicode(ex))
             else:
diff --git a/nova/api/ec2/apirequest.py b/nova/api/ec2/apirequest.py
index ca1302fad..a2c20efc0 100644
--- a/nova/api/ec2/apirequest.py
+++ b/nova/api/ec2/apirequest.py
@@ -21,6 +21,7 @@ APIRequest class
 """
 
 import datetime
+from lxml import etree
 # TODO(termie): replace minidom with etree
 from xml.dom import minidom
 
@@ -57,11 +58,10 @@ class APIRequest(object):
             method = getattr(self.controller,
                              ec2utils.camelcase_to_underscore(self.action))
         except AttributeError:
-            controller = self.controller
-            action = self.action
-            _error = _('Unsupported API request: controller = %(controller)s,'
-                    ' action = %(action)s') % locals()
-            LOG.exception(_error)
+            LOG.exception(_('Unsupported API request: controller = '
+                            '%(controller)s, action = %(action)s'),
+                          {'controller': self.controller,
+                           'action': self.action})
             # TODO(gundlach): Raise custom exception, trap in apiserver,
             #       and reraise as 400 error.
             raise exception.InvalidRequest()
@@ -96,6 +96,9 @@ class APIRequest(object):
         xml.appendChild(response_el)
 
         response = xml.toxml()
+        root = etree.fromstring(response)
+        response = etree.tostring(root, pretty_print=True)
+
         xml.unlink()
 
         # Don't write private key to log
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 181dfb0c2..da0a52caa 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -620,8 +620,7 @@ class CloudController(object):
         validprotocols = ['tcp', 'udp', 'icmp', '6', '17', '1']
         if 'ip_protocol' in values and \
             values['ip_protocol'] not in validprotocols:
-            protocol = values['ip_protocol']
-            err = _("Invalid IP protocol %(protocol)s.") % locals()
+            err = _('Invalid IP protocol %s.') % values['ip_protocol']
             raise exception.EC2APIError(message=err, code="400")
 
     def revoke_security_group_ingress(self, context, group_name=None,
@@ -874,9 +873,12 @@ class CloudController(object):
         volume_id = ec2utils.ec2_vol_id_to_uuid(volume_id)
         instance_uuid = ec2utils.ec2_inst_id_to_uuid(context, instance_id)
         instance = self.compute_api.get(context, instance_uuid)
-        msg = _("Attach volume %(volume_id)s to instance %(instance_id)s"
-                " at %(device)s") % locals()
-        LOG.audit(msg, context=context)
+        LOG.audit(_('Attach volume %(volume_id)s to instance %(instance_id)s '
+                    'at %(device)s'),
+                  {'volume_id': volume_id,
+                   'instance_id': instance_id,
+                   'device': device},
+                  context=context)
 
         try:
             self.compute_api.attach_volume(context, instance,
@@ -1236,7 +1238,7 @@ class CloudController(object):
         return {'publicIp': public_ip}
 
     def release_address(self, context, public_ip, **kwargs):
-        LOG.audit(_("Release address %s"), public_ip, context=context)
+        LOG.audit(_('Release address %s'), public_ip, context=context)
         try:
             self.network_api.release_floating_ip(context, address=public_ip)
             return {'return': "true"}
@@ -1244,8 +1246,10 @@ class CloudController(object):
             raise exception.EC2APIError(_('Unable to release IP Address.'))
 
     def associate_address(self, context, instance_id, public_ip, **kwargs):
-        LOG.audit(_("Associate address %(public_ip)s to"
-                " instance %(instance_id)s") % locals(), context=context)
+        LOG.audit(_("Associate address %(public_ip)s to instance "
+                    "%(instance_id)s"),
+                  {'public_ip': public_ip, 'instance_id': instance_id},
+                  context=context)
         instance_uuid = ec2utils.ec2_inst_id_to_uuid(context, instance_id)
         instance = self.compute_api.get(context, instance_uuid)
 
@@ -1504,9 +1508,10 @@ class CloudController(object):
             metadata['properties']['block_device_mapping'] = mappings
 
         image_id = self._register_image(context, metadata)
-        msg = _("Registered image %(image_location)s with"
-                " id %(image_id)s") % locals()
-        LOG.audit(msg, context=context)
+        LOG.audit(_('Registered image %(image_location)s with id '
+                    '%(image_id)s'),
+                  {'image_location': image_location, 'image_id': image_id},
+                  context=context)
         return {'imageId': image_id}
 
     def describe_image_attribute(self, context, image_id, attribute, **kwargs):
@@ -1613,10 +1618,10 @@ class CloudController(object):
         # CreateImage only supported for the analogue of EBS-backed instances
         if not self.compute_api.is_volume_backed_instance(context, instance,
                                                           bdms):
-            root = instance['root_device_name']
             msg = _("Invalid value '%(ec2_instance_id)s' for instanceId. "
                     "Instance does not have a volume attached at root "
-                    "(%(root)s)") % locals()
+                    "(%(root)s)") % {'root': instance['root_device_name'],
+                                     'ec2_instance_id': ec2_instance_id}
             raise exception.InvalidParameterValue(err=msg)
 
         # stop the instance if necessary
diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py
index bbaeba524..1eb30ee4a 100644
--- a/nova/api/metadata/handler.py
+++ b/nova/api/metadata/handler.py
@@ -166,10 +166,14 @@ class MetadataRequestHandler(wsgi.Application):
 
         if expected_signature != signature:
             if instance_id:
-                w = _('X-Instance-ID-Signature: %(signature)s does not match '
-                      'the expected value: %(expected_signature)s for id: '
-                      '%(instance_id)s.  Request From: %(remote_address)s')
-                LOG.warn(w % locals())
+                LOG.warn(_('X-Instance-ID-Signature: %(signature)s does not '
+                           'match the expected value: %(expected_signature)s '
+                           'for id: %(instance_id)s.  Request From: '
+                            '%(remote_address)s'),
+                         {'signature': signature,
+                          'expected_signature': expected_signature,
+                          'instance_id': instance_id,
+                          'remote_address': remote_address})
 
             msg = _('Invalid proxy request signature.')
             raise webob.exc.HTTPForbidden(explanation=msg)
diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index cc276234b..b2c189e79 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -174,18 +174,20 @@ class APIRouter(base_wsgi.Router):
 
     def _setup_extensions(self, ext_mgr):
         for extension in ext_mgr.get_controller_extensions():
-            ext_name = extension.extension.name
             collection = extension.collection
             controller = extension.controller
 
+            msg_format_dict = {'collection': collection,
+                               'ext_name': extension.extension.name}
             if collection not in self.resources:
                 LOG.warning(_('Extension %(ext_name)s: Cannot extend '
-                              'resource %(collection)s: No such resource') %
-                            locals())
+                              'resource %(collection)s: No such resource'),
+                            msg_format_dict)
                 continue
 
             LOG.debug(_('Extension %(ext_name)s extending resource: '
-                        '%(collection)s') % locals())
+                        '%(collection)s'),
+                      msg_format_dict)
 
             resource = self.resources[collection]
             resource.register_actions(controller)
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index 24250c0af..bec919f4b 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -113,7 +113,8 @@ def status_from_state(vm_state, task_state='default'):
     if status == "UNKNOWN":
         LOG.error(_("status is UNKNOWN from vm_state=%(vm_state)s "
                     "task_state=%(task_state)s. Bad upgrade or db "
-                    "corrupted?") % locals())
+                    "corrupted?"),
+                  {'vm_state': vm_state, 'task_state': task_state})
     return status
 
 
@@ -358,11 +359,12 @@ def raise_http_conflict_for_instance_invalid_state(exc, action):
     attr = exc.kwargs.get('attr')
     state = exc.kwargs.get('state')
     if attr and state:
-        msg = _("Cannot '%(action)s' while instance is in %(attr)s %(state)s")
+        msg = _("Cannot '%(action)s' while instance is in %(attr)s "
+                "%(state)s") % {'action': action, 'attr': attr, 'state': state}
     else:
         # At least give some meaningful message
-        msg = _("Instance is in an invalid state for '%(action)s'")
-    raise webob.exc.HTTPConflict(explanation=msg % locals())
+        msg = _("Instance is in an invalid state for '%s'") % action
+    raise webob.exc.HTTPConflict(explanation=msg)
 
 
 class MetadataDeserializer(wsgi.MetadataXMLDeserializer):
diff --git a/nova/api/openstack/compute/contrib/admin_actions.py b/nova/api/openstack/compute/contrib/admin_actions.py
index ff595fad6..3452136c0 100644
--- a/nova/api/openstack/compute/contrib/admin_actions.py
+++ b/nova/api/openstack/compute/contrib/admin_actions.py
@@ -289,11 +289,11 @@ class AdminActionsController(wsgi.Controller):
             raise exc.HTTPBadRequest(explanation=ex.format_message())
         except Exception:
             if host is None:
-                msg = _("Live migration of instance %(id)s to another host"
-                        " failed") % locals()
+                msg = _("Live migration of instance %s to another host "
+                        "failed") % id
             else:
-                msg = _("Live migration of instance %(id)s to host %(host)s"
-                        " failed") % locals()
+                msg = _("Live migration of instance %(id)s to host %(host)s "
+                        "failed") % {'id': id, 'host': host}
             LOG.exception(msg)
             # Return messages from scheduler
             raise exc.HTTPBadRequest(explanation=msg)
diff --git a/nova/api/openstack/compute/contrib/aggregates.py b/nova/api/openstack/compute/contrib/aggregates.py
index b73a50f39..b6b9f3561 100644
--- a/nova/api/openstack/compute/contrib/aggregates.py
+++ b/nova/api/openstack/compute/contrib/aggregates.py
@@ -86,7 +86,7 @@ class AggregateController(object):
         try:
             aggregate = self.api.get_aggregate(context, id)
         except exception.AggregateNotFound:
-            LOG.info(_("Cannot show aggregate: %(id)s") % locals())
+            LOG.info(_("Cannot show aggregate: %s"), id)
             raise exc.HTTPNotFound
         return self._marshall_aggregate(aggregate)
 
@@ -112,7 +112,7 @@ class AggregateController(object):
         try:
             aggregate = self.api.update_aggregate(context, id, updates)
         except exception.AggregateNotFound:
-            LOG.info(_("Cannot update aggregate: %(id)s") % locals())
+            LOG.info(_('Cannot update aggregate: %s'), id)
             raise exc.HTTPNotFound
 
         return self._marshall_aggregate(aggregate)
@@ -124,7 +124,7 @@ class AggregateController(object):
         try:
             self.api.delete_aggregate(context, id)
         except exception.AggregateNotFound:
-            LOG.info(_("Cannot delete aggregate: %(id)s") % locals())
+            LOG.info(_('Cannot delete aggregate: %s'), id)
             raise exc.HTTPNotFound
 
     def action(self, req, id, body):
@@ -137,7 +137,7 @@ class AggregateController(object):
             try:
                 return _actions[action](req, id, data)
             except KeyError:
-                msg = _("Aggregates does not have %s action") % action
+                msg = _('Aggregates does not have %s action') % action
                 raise exc.HTTPBadRequest(explanation=msg)
 
         raise exc.HTTPBadRequest(explanation=_("Invalid request body"))
@@ -150,13 +150,13 @@ class AggregateController(object):
         try:
             aggregate = self.api.add_host_to_aggregate(context, id, host)
         except (exception.AggregateNotFound, exception.ComputeHostNotFound):
-            LOG.info(_("Cannot add host %(host)s in aggregate "
-                            "%(id)s") % locals())
+            LOG.info(_('Cannot add host %(host)s in aggregate %(id)s'),
+                     {'host': host, 'id': id})
             raise exc.HTTPNotFound
         except (exception.AggregateHostExists,
                 exception.InvalidAggregateAction):
-            LOG.info(_("Cannot add host %(host)s in aggregate "
-                            "%(id)s") % locals())
+            LOG.info(_('Cannot add host %(host)s in aggregate %(id)s'),
+                     {'host': host, 'id': id})
             raise exc.HTTPConflict
         return self._marshall_aggregate(aggregate)
 
@@ -169,12 +169,12 @@ class AggregateController(object):
             aggregate = self.api.remove_host_from_aggregate(context, id, host)
         except (exception.AggregateNotFound, exception.AggregateHostNotFound,
                 exception.ComputeHostNotFound):
-            LOG.info(_("Cannot remove host %(host)s in aggregate "
-                            "%(id)s") % locals())
+            LOG.info(_('Cannot remove host %(host)s in aggregate %(id)s'),
+                     {'host': host, 'id': id})
             raise exc.HTTPNotFound
         except exception.InvalidAggregateAction:
-            LOG.info(_("Cannot remove host %(host)s in aggregate "
-                "%(id)s") % locals())
+            LOG.info(_('Cannot remove host %(host)s in aggregate %(id)s'),
+                     {'host': host, 'id': id})
             raise exc.HTTPConflict
         return self._marshall_aggregate(aggregate)
 
@@ -193,8 +193,8 @@ class AggregateController(object):
             aggregate = self.api.update_aggregate_metadata(context,
                                                            id, metadata)
         except exception.AggregateNotFound:
-            LOG.info(_("Cannot set metadata %(metadata)s in aggregate "
-                            "%(id)s") % locals())
+            LOG.info(_('Cannot set metadata %(metadata)s in aggregate %(id)s'),
+                     {'metadata': metadata, 'id': id})
             raise exc.HTTPNotFound
 
         return self._marshall_aggregate(aggregate)
diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py
index d2cf99431..a3d03e8de 100644
--- a/nova/api/openstack/compute/contrib/floating_ips.py
+++ b/nova/api/openstack/compute/contrib/floating_ips.py
@@ -244,7 +244,7 @@ class FloatingIPActionController(wsgi.Controller):
 
         if not fixed_address:
             fixed_address = fixed_ips[0]['address']
-            if  len(fixed_ips) > 1:
+            if len(fixed_ips) > 1:
                 msg = _('multiple fixed_ips exist, using the first: %s')
                 LOG.warning(msg, fixed_address)
 
@@ -309,7 +309,7 @@ class FloatingIPActionController(wsgi.Controller):
             return webob.Response(status_int=202)
         else:
             msg = _("Floating ip %(address)s is not associated with instance "
-                    "%(id)s.") % locals()
+                    "%(id)s.") % {'address': address, 'id': id}
             raise webob.exc.HTTPUnprocessableEntity(explanation=msg)
 
 
diff --git a/nova/api/openstack/compute/contrib/hosts.py b/nova/api/openstack/compute/contrib/hosts.py
index a896678f0..e0ea1203b 100644
--- a/nova/api/openstack/compute/contrib/hosts.py
+++ b/nova/api/openstack/compute/contrib/hosts.py
@@ -202,8 +202,9 @@ class HostController(object):
     def _set_host_maintenance(self, context, host_name, mode=True):
         """Start/Stop host maintenance window. On start, it triggers
         guest VMs evacuation."""
-        LOG.audit(_("Putting host %(host_name)s in maintenance "
-                    "mode %(mode)s.") % locals())
+        LOG.audit(_("Putting host %(host_name)s in maintenance mode "
+                    "%(mode)s."),
+                  {'host_name': host_name, 'mode': mode})
         try:
             result = self.api.set_host_maintenance(context, host_name, mode)
         except NotImplementedError:
diff --git a/nova/api/openstack/compute/contrib/instance_actions.py b/nova/api/openstack/compute/contrib/instance_actions.py
index 4eaa9a1ee..3b15de2ba 100644
--- a/nova/api/openstack/compute/contrib/instance_actions.py
+++ b/nova/api/openstack/compute/contrib/instance_actions.py
@@ -19,6 +19,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
+from nova import exception
 
 authorize_actions = extensions.extension_authorizer('compute',
                                                     'instance_actions')
@@ -84,7 +85,10 @@ class InstanceActionsController(wsgi.Controller):
     def index(self, req, server_id):
         """Returns the list of actions recorded for a given instance."""
         context = req.environ["nova.context"]
-        instance = self.compute_api.get(context, server_id)
+        try:
+            instance = self.compute_api.get(context, server_id)
+        except exception.InstanceNotFound as err:
+            raise exc.HTTPNotFound(explanation=err.format_message())
         authorize_actions(context, target=instance)
         actions_raw = self.action_api.actions_get(context, instance)
         actions = [self._format_action(action) for action in actions_raw]
diff --git a/nova/api/openstack/compute/contrib/services.py b/nova/api/openstack/compute/contrib/services.py
index 9952484f7..bc5f60b64 100644
--- a/nova/api/openstack/compute/contrib/services.py
+++ b/nova/api/openstack/compute/contrib/services.py
@@ -22,8 +22,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova import exception
-from nova.openstack.common import timeutils
-from nova import utils
+from nova import servicegroup
 
 authorize = extensions.extension_authorizer('compute', 'services')
 CONF = cfg.CONF
@@ -71,6 +70,7 @@ class ServiceController(object):
 
     def __init__(self):
         self.host_api = compute.HostAPI()
+        self.servicegroup_api = servicegroup.API()
 
     @wsgi.serializers(xml=ServicesIndexTemplate)
     def index(self, req):
@@ -79,7 +79,6 @@ class ServiceController(object):
         """
         context = req.environ['nova.context']
         authorize(context)
-        now = timeutils.utcnow()
         services = self.host_api.service_get_all(
             context, set_zones=True)
 
@@ -96,8 +95,7 @@ class ServiceController(object):
 
         svcs = []
         for svc in services:
-            delta = now - (svc['updated_at'] or svc['created_at'])
-            alive = abs(utils.total_seconds(delta)) <= CONF.service_down_time
+            alive = self.servicegroup_api.service_is_up(svc)
             art = (alive and "up") or "down"
             active = 'enabled'
             if svc['disabled']:
diff --git a/nova/api/openstack/compute/contrib/volumes.py b/nova/api/openstack/compute/contrib/volumes.py
index e49c65b2f..3ede9e4a4 100644
--- a/nova/api/openstack/compute/contrib/volumes.py
+++ b/nova/api/openstack/compute/contrib/volumes.py
@@ -27,7 +27,6 @@ from nova import exception
 from nova.openstack.common import log as logging
 from nova.openstack.common import strutils
 from nova.openstack.common import uuidutils
-from nova import utils
 from nova import volume
 
 LOG = logging.getLogger(__name__)
@@ -397,9 +396,12 @@ class VolumeAttachmentController(wsgi.Controller):
 
         self._validate_volume_id(volume_id)
 
-        msg = _("Attach volume %(volume_id)s to instance %(server_id)s"
-                " at %(device)s") % locals()
-        LOG.audit(msg, context=context)
+        LOG.audit(_("Attach volume %(volume_id)s to instance %(server_id)s "
+                    "at %(device)s"),
+                  {'volume_id': volume_id,
+                   'device': device,
+                   'server_id': server_id},
+                  context=context)
 
         try:
             instance = self.compute_api.get(context, server_id)
@@ -614,27 +616,26 @@ class SnapshotController(wsgi.Controller):
         snapshot = body['snapshot']
         volume_id = snapshot['volume_id']
 
-        force = snapshot.get('force', False)
         LOG.audit(_("Create snapshot from volume %s"), volume_id,
-                context=context)
+                  context=context)
 
-        if not utils.is_valid_boolstr(force):
+        force = snapshot.get('force', False)
+        try:
+            force = strutils.bool_from_string(force, strict=True)
+        except ValueError:
             msg = _("Invalid value '%s' for force.") % force
             raise exception.InvalidParameterValue(err=msg)
 
-        if strutils.bool_from_string(force):
-            new_snapshot = self.volume_api.create_snapshot_force(context,
-                                        volume_id,
-                                        snapshot.get('display_name'),
-                                        snapshot.get('display_description'))
+        if force:
+            create_func = self.volume_api.create_snapshot_force
         else:
-            new_snapshot = self.volume_api.create_snapshot(context,
-                                        volume_id,
-                                        snapshot.get('display_name'),
-                                        snapshot.get('display_description'))
+            create_func = self.volume_api.create_snapshot
 
-        retval = _translate_snapshot_detail_view(context, new_snapshot)
+        new_snapshot = create_func(context, volume_id,
+                                   snapshot.get('display_name'),
+                                   snapshot.get('display_description'))
 
+        retval = _translate_snapshot_detail_view(context, new_snapshot)
         return {'snapshot': retval}
 
 
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index cb3f7ad49..44d8dce3b 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -1282,18 +1282,16 @@ class Controller(wsgi.Controller):
         except exception.InstanceNotFound:
             msg = _("Instance could not be found")
             raise exc.HTTPNotFound(explanation=msg)
-        except exception.InvalidMetadata as error:
-            raise exc.HTTPBadRequest(
-                explanation=error.format_message())
         except exception.InvalidMetadataSize as error:
             raise exc.HTTPRequestEntityTooLarge(
                 explanation=error.format_message())
         except exception.ImageNotFound:
             msg = _("Cannot find image for rebuild")
             raise exc.HTTPBadRequest(explanation=msg)
-        except exception.InstanceTypeMemoryTooSmall as error:
-            raise exc.HTTPBadRequest(explanation=error.format_message())
-        except exception.InstanceTypeDiskTooSmall as error:
+        except (exception.InvalidMetadata,
+                exception.InstanceTypeMemoryTooSmall,
+                exception.InstanceTypeDiskTooSmall,
+                exception.ImageNotActive) as error:
             raise exc.HTTPBadRequest(explanation=error.format_message())
 
         instance = self._get_server(context, req, id)
@@ -1392,7 +1390,7 @@ class Controller(wsgi.Controller):
     def _get_server_search_options(self):
         """Return server search options allowed by non-admin."""
         return ('reservation_id', 'name', 'status', 'image', 'flavor',
-                'changes-since', 'all_tenants')
+                'ip', 'changes-since', 'all_tenants')
 
 
 def create_resource(ext_mgr):
@@ -1406,9 +1404,8 @@ def remove_invalid_options(context, search_options, allowed_search_options):
         return
     # Otherwise, strip out all unknown options
     unknown_options = [opt for opt in search_options
-            if opt not in allowed_search_options]
-    unk_opt_str = ", ".join(unknown_options)
-    log_msg = _("Removing options '%(unk_opt_str)s' from query") % locals()
-    LOG.debug(log_msg)
+                        if opt not in allowed_search_options]
+    LOG.debug(_("Removing options '%s' from query"),
+              ", ".join(unknown_options))
     for opt in unknown_options:
         search_options.pop(opt, None)
diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py
index dcf6149e5..83e4b7ba5 100644
--- a/nova/api/openstack/extensions.py
+++ b/nova/api/openstack/extensions.py
@@ -275,7 +275,8 @@ class ExtensionManager(object):
                 self.load_extension(ext_factory)
             except Exception as exc:
                 LOG.warn(_('Failed to load extension %(ext_factory)s: '
-                           '%(exc)s') % locals())
+                           '%(exc)s'),
+                         {'ext_factory': ext_factory, 'exc': exc})
 
 
 class ControllerExtension(object):
@@ -344,19 +345,18 @@ def load_standard_extensions(ext_mgr, logger, path, package, ext_list=None):
                 ext_mgr.load_extension(classpath)
             except Exception as exc:
                 logger.warn(_('Failed to load extension %(classpath)s: '
-                              '%(exc)s') % locals())
+                              '%(exc)s'),
+                            {'classpath': classpath, 'exc': exc})
 
         # Now, let's consider any subdirectories we may have...
         subdirs = []
         for dname in dirnames:
             # Skip it if it does not have __init__.py
-            if not os.path.exists(os.path.join(dirpath, dname,
-                                               '__init__.py')):
+            if not os.path.exists(os.path.join(dirpath, dname, '__init__.py')):
                 continue
 
             # If it has extension(), delegate...
-            ext_name = ("%s%s.%s.extension" %
-                        (package, relpkg, dname))
+            ext_name = "%s%s.%s.extension" % (package, relpkg, dname)
             try:
                 ext = importutils.import_class(ext_name)
             except ImportError:
@@ -367,8 +367,9 @@ def load_standard_extensions(ext_mgr, logger, path, package, ext_list=None):
                 try:
                     ext(ext_mgr)
                 except Exception as exc:
-                    logger.warn(_('Failed to load extension %(ext_name)s: '
-                                  '%(exc)s') % locals())
+                    logger.warn(_('Failed to load extension %(ext_name)s:'
+                                  '%(exc)s'),
+                                {'ext_name': ext_name, 'exc': exc})
 
         # Update the list of directories we'll explore...
         dirnames[:] = subdirs
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index 03674d767..9c5f9855d 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -916,7 +916,9 @@ class Resource(wsgi.Application):
             return Fault(webob.exc.HTTPBadRequest(explanation=msg))
 
         if body:
-            LOG.debug(_("Action: '%(action)s', body: %(body)s") % locals())
+            msg = _("Action: '%(action)s', body: "
+                    "%(body)s") % {'action': action, 'body': body}
+            LOG.debug(msg)
         LOG.debug(_("Calling method %s") % meth)
 
         # Now, deserialize the request body...
diff --git a/nova/api/openstack/xmlutil.py b/nova/api/openstack/xmlutil.py
index 9bcce808c..04f5e28e3 100644
--- a/nova/api/openstack/xmlutil.py
+++ b/nova/api/openstack/xmlutil.py
@@ -739,10 +739,9 @@ class MasterTemplate(Template):
 
             # Make sure we have a tree match
             if slave.root.tag != self.root.tag:
-                slavetag = slave.root.tag
-                mastertag = self.root.tag
-                msg = _("Template tree mismatch; adding slave %(slavetag)s "
-                        "to master %(mastertag)s") % locals()
+                msg = _("Template tree mismatch; adding slave %(slavetag)s to "
+                        "master %(mastertag)s") % {'slavetag': slave.root.tag,
+                                                   'mastertag': self.root.tag}
                 raise ValueError(msg)
 
             # Make sure slave applies to this template
diff --git a/nova/cells/messaging.py b/nova/cells/messaging.py
index d13677f74..1ea68d29f 100644
--- a/nova/cells/messaging.py
+++ b/nova/cells/messaging.py
@@ -202,7 +202,7 @@ class _BaseMessage(object):
             resp_value = sys.exc_info()
             failure = True
             LOG.exception(_("Error processing message locally: %(exc)s"),
-                          locals())
+                          {'exc': exc})
         return Response(self.routing_path, resp_value, failure)
 
     def _setup_response_queue(self):
@@ -355,14 +355,18 @@ class _TargetedMessage(_BaseMessage):
         next_hop_num = current_hops + 1
         dest_hops = target_cell.count(_PATH_CELL_SEP)
         if dest_hops < current_hops:
+            reason_args = {'target_cell': target_cell,
+                           'routing_path': routing_path}
             reason = _("destination is %(target_cell)s but routing_path "
-                    "is %(routing_path)s") % locals()
+                       "is %(routing_path)s") % reason_args
             raise exception.CellRoutingInconsistency(reason=reason)
         dest_name_parts = target_cell.split(_PATH_CELL_SEP)
         if (_PATH_CELL_SEP.join(dest_name_parts[:next_hop_num]) !=
                 routing_path):
+            reason_args = {'target_cell': target_cell,
+                           'routing_path': routing_path}
             reason = _("destination is %(target_cell)s but routing_path "
-                    "is %(routing_path)s") % locals()
+                       "is %(routing_path)s") % reason_args
             raise exception.CellRoutingInconsistency(reason=reason)
         next_hop_name = dest_name_parts[next_hop_num]
         if self.direction == 'up':
@@ -371,8 +375,10 @@ class _TargetedMessage(_BaseMessage):
             next_hop = self.state_manager.get_child_cell(next_hop_name)
         if not next_hop:
             cell_type = 'parent' if self.direction == 'up' else 'child'
+            reason_args = {'cell_type': cell_type,
+                           'target_cell': target_cell}
             reason = _("Unknown %(cell_type)s when routing to "
-                       "%(target_cell)s") % locals()
+                       "%(target_cell)s") % reason_args
             raise exception.CellRoutingInconsistency(reason=reason)
         return next_hop
 
@@ -396,7 +402,7 @@ class _TargetedMessage(_BaseMessage):
         except Exception as exc:
             exc_info = sys.exc_info()
             LOG.exception(_("Error locating next hop for message: %(exc)s"),
-                          locals())
+                          {'exc': exc})
             return self._send_response_from_exception(exc_info)
 
         if next_hop.is_me:
@@ -424,7 +430,7 @@ class _TargetedMessage(_BaseMessage):
             exc_info = sys.exc_info()
             err_str = _("Failed to send message to cell: %(next_hop)s: "
                         "%(exc)s")
-            LOG.exception(err_str, locals())
+            LOG.exception(err_str, {'exc': exc, 'next_hop': next_hop})
             self._cleanup_response_queue()
             return self._send_response_from_exception(exc_info)
 
@@ -502,7 +508,7 @@ class _BroadcastMessage(_BaseMessage):
         except Exception as exc:
             exc_info = sys.exc_info()
             LOG.exception(_("Error locating next hops for message: %(exc)s"),
-                          locals())
+                          {'exc': exc})
             return self._send_response_from_exception(exc_info)
 
         # Short circuit if we don't need to respond
@@ -522,7 +528,7 @@ class _BroadcastMessage(_BaseMessage):
             # with the failure.
             exc_info = sys.exc_info()
             LOG.exception(_("Error sending message to next hops: %(exc)s"),
-                          locals())
+                          {'exc': exc})
             self._cleanup_response_queue()
             return self._send_response_from_exception(exc_info)
 
@@ -541,7 +547,7 @@ class _BroadcastMessage(_BaseMessage):
             exc_info = sys.exc_info()
             err_str = _("Error waiting for responses from neighbor cells: "
                         "%(exc)s")
-            LOG.exception(err_str, locals())
+            LOG.exception(err_str, {'exc': exc})
             return self._send_response_from_exception(exc_info)
 
         if local_response:
@@ -652,7 +658,7 @@ class _TargetedMessageMethods(_BaseMessageMethods):
         if not fn:
             detail = _("Unknown method '%(method)s' in compute API")
             raise exception.CellServiceAPIMethodNotFound(
-                    detail=detail % locals())
+                    detail=detail % {'method': method})
         args = list(method_info['method_args'])
         # 1st arg is instance_uuid that we need to turn into the
         # instance object.
@@ -674,7 +680,8 @@ class _TargetedMessageMethods(_BaseMessageMethods):
     def update_capabilities(self, message, cell_name, capabilities):
         """A child cell told us about their capabilities."""
         LOG.debug(_("Received capabilities from child cell "
-                "%(cell_name)s: %(capabilities)s"), locals())
+                    "%(cell_name)s: %(capabilities)s"),
+                  {'cell_name': cell_name, 'capabilities': capabilities})
         self.state_manager.update_cell_capabilities(cell_name,
                 capabilities)
         # Go ahead and update our parents now that a child updated us
@@ -683,7 +690,8 @@ class _TargetedMessageMethods(_BaseMessageMethods):
     def update_capacities(self, message, cell_name, capacities):
         """A child cell told us about their capacity."""
         LOG.debug(_("Received capacities from child cell "
-                "%(cell_name)s: %(capacities)s"), locals())
+                    "%(cell_name)s: %(capacities)s"),
+                  {'cell_name': cell_name, 'capacities': capacities})
         self.state_manager.update_cell_capacities(cell_name,
                 capacities)
         # Go ahead and update our parents now that a child updated us
@@ -808,8 +816,8 @@ class _BroadcastMessageMethods(_BaseMessageMethods):
                     for md in instance['system_metadata']])
             instance['system_metadata'] = sys_metadata
 
-        LOG.debug(_("Got update for instance %(instance_uuid)s: "
-                "%(instance)s") % locals())
+        LOG.debug(_("Got update for instance: %(instance)s"),
+                  {'instance': instance}, instance_uuid=instance_uuid)
 
         # To attempt to address out-of-order messages, do some sanity
         # checking on the VM state.
@@ -839,8 +847,8 @@ class _BroadcastMessageMethods(_BaseMessageMethods):
                 self.db.instance_create(message.ctxt, instance)
         if info_cache:
             try:
-                self.db.instance_info_cache_update(message.ctxt,
-                        instance_uuid, info_cache, update_cells=False)
+                self.db.instance_info_cache_update(
+                        message.ctxt, instance_uuid, info_cache)
             except exception.InstanceInfoCacheNotFound:
                 # Can happen if we try to update a deleted instance's
                 # network information.
@@ -851,8 +859,8 @@ class _BroadcastMessageMethods(_BaseMessageMethods):
         if not self._at_the_top():
             return
         instance_uuid = instance['uuid']
-        LOG.debug(_("Got update to delete instance %(instance_uuid)s") %
-                locals())
+        LOG.debug(_("Got update to delete instance"),
+                  instance_uuid=instance_uuid)
         try:
             self.db.instance_destroy(message.ctxt, instance_uuid,
                     update_cells=False)
@@ -867,7 +875,7 @@ class _BroadcastMessageMethods(_BaseMessageMethods):
         soft-deleted.  So, we'll run it everywhere.
         """
         LOG.debug(_("Got broadcast to %(delete_type)s delete instance"),
-            locals(), instance=instance)
+                  {'delete_type': delete_type}, instance=instance)
         if delete_type == 'soft':
             self.compute_api.soft_delete(message.ctxt, instance)
         else:
@@ -882,7 +890,7 @@ class _BroadcastMessageMethods(_BaseMessageMethods):
             instance_fault.pop(key, None)
         log_str = _("Got message to create instance fault: "
                     "%(instance_fault)s")
-        LOG.debug(log_str, locals())
+        LOG.debug(log_str, {'instance_fault': instance_fault})
         self.db.instance_fault_create(message.ctxt, instance_fault)
 
     def bw_usage_update_at_top(self, message, bw_update_info, **kwargs):
@@ -902,7 +910,8 @@ class _BroadcastMessageMethods(_BaseMessageMethods):
         projid_str = project_id is None and "<all>" or project_id
         since_str = updated_since is None and "<all>" or updated_since
         LOG.info(_("Forcing a sync of instances, project_id="
-                   "%(projid_str)s, updated_since=%(since_str)s"), locals())
+                   "%(projid_str)s, updated_since=%(since_str)s"),
+                 {'projid_str': projid_str, 'since_str': since_str})
         if updated_since is not None:
             updated_since = timeutils.parse_isotime(updated_since)
         instances = cells_utils.get_instances_to_sync(message.ctxt,
@@ -1086,7 +1095,7 @@ class MessageRunner(object):
         my_cell_info = self.state_manager.get_my_state()
         capabs = self.state_manager.get_our_capabilities()
         LOG.debug(_("Updating parents with our capabilities: %(capabs)s"),
-                locals())
+                  {'capabs': capabs})
         # We have to turn the sets into lists so they can potentially
         # be json encoded when the raw message is sent.
         for key, values in capabs.items():
@@ -1106,7 +1115,7 @@ class MessageRunner(object):
         my_cell_info = self.state_manager.get_my_state()
         capacities = self.state_manager.get_our_capacities()
         LOG.debug(_("Updating parents with our capacities: %(capacities)s"),
-                locals())
+                  {'capacities': capacities})
         method_kwargs = {'cell_name': my_cell_info.name,
                          'capacities': capacities}
         for cell in parent_cells:
@@ -1120,8 +1129,7 @@ class MessageRunner(object):
         """
         method_kwargs = dict(host_sched_kwargs=host_sched_kwargs)
         message = _TargetedMessage(self, ctxt, 'schedule_run_instance',
-                                    method_kwargs, 'down',
-                                    target_cell)
+                                   method_kwargs, 'down', target_cell)
         message.process()
 
     def run_compute_api_method(self, ctxt, cell_name, method_info, call):
diff --git a/nova/cells/scheduler.py b/nova/cells/scheduler.py
index 8ec65b2d0..18389dbc5 100644
--- a/nova/cells/scheduler.py
+++ b/nova/cells/scheduler.py
@@ -104,7 +104,7 @@ class CellsScheduler(base.Base):
         target_cell = cells[0]
 
         LOG.debug(_("Scheduling with routing_path=%(routing_path)s"),
-                locals())
+                  {'routing_path': message.routing_path})
 
         if target_cell.is_me:
             # Need to create instance DB entries as the host scheduler
@@ -130,14 +130,15 @@ class CellsScheduler(base.Base):
                         raise
                     sleep_time = max(1, CONF.cells.scheduler_retry_delay)
                     LOG.info(_("No cells available when scheduling.  Will "
-                            "retry in %(sleep_time)s second(s)"), locals())
+                               "retry in %(sleep_time)s second(s)"),
+                             {'sleep_time': sleep_time})
                     time.sleep(sleep_time)
                     continue
         except Exception:
             request_spec = host_sched_kwargs['request_spec']
             instance_uuids = request_spec['instance_uuids']
             LOG.exception(_("Error scheduling instances %(instance_uuids)s"),
-                    locals())
+                          {'instance_uuids': instance_uuids})
             ctxt = message.ctxt
             for instance_uuid in instance_uuids:
                 self.msg_runner.instance_update_at_top(ctxt,
diff --git a/nova/cells/state.py b/nova/cells/state.py
index 403f42d47..f1c77cef1 100644
--- a/nova/cells/state.py
+++ b/nova/cells/state.py
@@ -313,7 +313,8 @@ class CellStateManager(base.Base):
             cell = self.parent_cells.get(cell_name)
         if not cell:
             LOG.error(_("Unknown cell '%(cell_name)s' when trying to "
-                        "update capabilities"), locals())
+                        "update capabilities"),
+                      {'cell_name': cell_name})
             return
         # Make sure capabilities are sets.
         for capab_name, values in capabilities.items():
@@ -328,7 +329,8 @@ class CellStateManager(base.Base):
             cell = self.parent_cells.get(cell_name)
         if not cell:
             LOG.error(_("Unknown cell '%(cell_name)s' when trying to "
-                        "update capacities"), locals())
+                        "update capacities"),
+                      {'cell_name': cell_name})
             return
         cell.update_capacities(capacities)
 
diff --git a/nova/cmd/all.py b/nova/cmd/all.py
index f510069b6..517033d05 100644
--- a/nova/cmd/all.py
+++ b/nova/cmd/all.py
@@ -49,19 +49,19 @@ def main():
     logging.setup("nova")
     LOG = logging.getLogger('nova.all')
     utils.monkey_patch()
-    launcher = service.ProcessLauncher()
+    launcher = service.process_launcher()
 
     # nova-api
     for api in CONF.enabled_apis:
         try:
             server = service.WSGIService(api)
-            launcher.launch_server(server, workers=server.workers or 1)
+            launcher.launch_service(server, workers=server.workers or 1)
         except (Exception, SystemExit):
             LOG.exception(_('Failed to load %s') % '%s-api' % api)
 
     for mod in [s3server, xvp_proxy]:
         try:
-            launcher.launch_server(mod.get_wsgi_server())
+            launcher.launch_service(mod.get_wsgi_server())
         except (Exception, SystemExit):
             LOG.exception(_('Failed to load %s') % mod.__name__)
 
@@ -82,8 +82,8 @@ def main():
             manager = None
 
         try:
-            launcher.launch_server(service.Service.create(binary=binary,
-                                                          topic=topic,
+            launcher.launch_service(service.Service.create(binary=binary,
+                                                           topic=topic,
                                                           manager=manager))
         except (Exception, SystemExit):
             LOG.exception(_('Failed to load %s'), binary)
diff --git a/nova/cmd/api.py b/nova/cmd/api.py
index a7f6313b0..f838d988f 100644
--- a/nova/cmd/api.py
+++ b/nova/cmd/api.py
@@ -41,7 +41,7 @@ def main():
     logging.setup("nova")
     utils.monkey_patch()
 
-    launcher = service.ProcessLauncher()
+    launcher = service.process_launcher()
     for api in CONF.enabled_apis:
         should_use_ssl = api in CONF.enabled_ssl_apis
         if api == 'ec2':
@@ -49,5 +49,5 @@ def main():
                                          max_url_len=16384)
         else:
             server = service.WSGIService(api, use_ssl=should_use_ssl)
-        launcher.launch_server(server, workers=server.workers or 1)
+        launcher.launch_service(server, workers=server.workers or 1)
     launcher.wait()
diff --git a/nova/cmd/spicehtml5proxy.py b/nova/cmd/spicehtml5proxy.py
index 8e005bcad..c6f2be53d 100644
--- a/nova/cmd/spicehtml5proxy.py
+++ b/nova/cmd/spicehtml5proxy.py
@@ -59,13 +59,13 @@ opts = [
                help='Port on which to listen for incoming requests'),
     ]
 
-CONF = cfg.CONF
-CONF.register_cli_opts(opts)
-CONF.import_opt('debug', 'nova.openstack.common.log')
-
 
 def main():
     # Setup flags
+
+    CONF = cfg.CONF
+    CONF.register_cli_opts(opts)
+    CONF.import_opt('debug', 'nova.openstack.common.log')
     config.parse_args(sys.argv)
 
     if CONF.ssl_only and not os.path.exists(CONF.cert):
diff --git a/nova/compute/api.py b/nova/compute/api.py
index f47121c36..24d73ec0d 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -476,6 +476,26 @@ class API(base.Base):
                 instance['uuid'], updates)
         return instance
 
+    def _check_config_drive(self, context, config_drive):
+        bool_like = True
+        try:
+            strutils.bool_from_string(config_drive, strict=True)
+        except ValueError:
+            bool_like = False
+
+        if config_drive is None:
+            return None, None
+        elif bool_like and config_drive not in (0, 1, '0', '1'):
+            # NOTE(sirp): '0' and '1' could be a bool value or an ID.  Since
+            # there are many other ways to specify bools (e.g. 't', 'f'), it's
+            # better to treat as an ID.
+            return None, config_drive
+        else:
+            cd_image_service, config_drive_id = \
+                glance.get_remote_image_service(context, config_drive)
+            cd_image_service.show(context, config_drive_id)
+            return config_drive_id, None
+
     def _validate_and_provision_instance(self, context, instance_type,
                                          image_href, kernel_id, ramdisk_id,
                                          min_count, max_count,
@@ -557,17 +577,8 @@ class API(base.Base):
             kernel_id, ramdisk_id = self._handle_kernel_and_ramdisk(
                     context, kernel_id, ramdisk_id, image)
 
-            # Handle config_drive
-            config_drive_id = None
-            if config_drive and not utils.is_valid_boolstr(config_drive):
-                # config_drive is volume id
-                config_drive_id = config_drive
-                config_drive = None
-
-                # Ensure config_drive image exists
-                cd_image_service, config_drive_id = \
-                    glance.get_remote_image_service(context, config_drive_id)
-                cd_image_service.show(context, config_drive_id)
+            config_drive_id, config_drive = self._check_config_drive(
+                context, config_drive)
 
             if key_data is None and key_name:
                 key_pair = self.db.key_pair_get(context, context.user_id,
@@ -1732,7 +1743,7 @@ class API(base.Base):
                 method='reboot')
         state = {'SOFT': task_states.REBOOTING,
                  'HARD': task_states.REBOOTING_HARD}[reboot_type]
-        instance = self.update(context, instance, vm_state=vm_states.ACTIVE,
+        instance = self.update(context, instance,
                                task_state=state,
                                expected_task_state=[None,
                                                     task_states.REBOOTING])
@@ -1746,25 +1757,13 @@ class API(base.Base):
                                             block_device_info=block_info,
                                             reboot_type=reboot_type)
 
-    def _get_image(self, context, image_href):
-        """Throws an ImageNotFound exception if image_href does not exist."""
-        (image_service, image_id) = glance.get_remote_image_service(context,
-                                                                 image_href)
-        return image_service.show(context, image_id)
-
     @wrap_check_policy
     @check_instance_lock
     @check_instance_state(vm_state=[vm_states.ACTIVE, vm_states.STOPPED],
                           task_state=[None])
     def rebuild(self, context, instance, image_href, admin_password, **kwargs):
         """Rebuild the given instance with the provided attributes."""
-
-        if instance['image_ref']:
-            orig_image_ref = instance['image_ref']
-            image = self._get_image(context, image_href)
-        else:
-            orig_image_ref = ''
-            image = {}
+        orig_image_ref = instance['image_ref'] or ''
 
         files_to_inject = kwargs.pop('files_to_inject', [])
         self._check_injected_file_quota(context, files_to_inject)
@@ -1772,18 +1771,21 @@ class API(base.Base):
         metadata = kwargs.get('metadata', {})
         self._check_metadata_properties_quota(context, metadata)
 
+        if image_href:
+            (image_service, image_id) = glance.get_remote_image_service(
+                    context, image_href)
+            image = image_service.show(context, image_id)
+            if image['status'] != 'active':
+                raise exception.ImageNotActive(image_id=image_id)
+        else:
+            image = {}
+
         instance_type = flavors.extract_instance_type(instance)
         if instance_type['memory_mb'] < int(image.get('min_ram') or 0):
             raise exception.InstanceTypeMemoryTooSmall()
         if instance_type['root_gb'] < int(image.get('min_disk') or 0):
             raise exception.InstanceTypeDiskTooSmall()
 
-        if image_href:
-            (image_service, image_id) = glance.get_remote_image_service(
-                context, image_href)
-            image = image_service.show(context, image_id)
-        else:
-            image = {}
         kernel_id, ramdisk_id = self._handle_kernel_and_ramdisk(
                 context, None, None, image)
 
@@ -2009,7 +2011,11 @@ class API(base.Base):
             raise exception.FlavorNotFound(flavor_id=flavor_id)
 
         # NOTE(markwash): look up the image early to avoid auth problems later
-        image = self.image_service.show(context, instance['image_ref'])
+        image_ref = instance.get('image_ref')
+        if image_ref:
+            image = self.image_service.show(context, image_ref)
+        else:
+            image = {}
 
         if same_instance_type and flavor_id:
             raise exception.CannotResizeToSameFlavor()
@@ -2101,7 +2107,6 @@ class API(base.Base):
         """Pause the given instance."""
         self.update(context,
                     instance,
-                    vm_state=vm_states.ACTIVE,
                     task_state=task_states.PAUSING,
                     expected_task_state=None)
 
@@ -2116,7 +2121,6 @@ class API(base.Base):
         """Unpause the given instance."""
         self.update(context,
                     instance,
-                    vm_state=vm_states.PAUSED,
                     task_state=task_states.UNPAUSING,
                     expected_task_state=None)
 
@@ -2136,7 +2140,6 @@ class API(base.Base):
         """Suspend the given instance."""
         self.update(context,
                     instance,
-                    vm_state=vm_states.ACTIVE,
                     task_state=task_states.SUSPENDING,
                     expected_task_state=None)
 
@@ -2151,7 +2154,6 @@ class API(base.Base):
         """Resume the given instance."""
         self.update(context,
                     instance,
-                    vm_state=vm_states.SUSPENDED,
                     task_state=task_states.RESUMING,
                     expected_task_state=None)
 
@@ -2180,7 +2182,6 @@ class API(base.Base):
 
         self.update(context,
                     instance,
-                    vm_state=vm_states.ACTIVE,
                     task_state=task_states.RESCUING,
                     expected_task_state=None)
 
@@ -2196,7 +2197,6 @@ class API(base.Base):
         """Unrescue the given instance."""
         self.update(context,
                     instance,
-                    vm_state=vm_states.RESCUED,
                     task_state=task_states.UNRESCUING,
                     expected_task_state=None)
 
diff --git a/nova/compute/cells_api.py b/nova/compute/cells_api.py
index 7168313ec..4beeaeb3d 100644
--- a/nova/compute/cells_api.py
+++ b/nova/compute/cells_api.py
@@ -559,6 +559,16 @@ class ComputeCellsAPI(compute_api.API):
             pass
         return rv
 
+    @validate_cell
+    def live_migrate(self, context, instance, block_migration,
+                     disk_over_commit, host_name):
+        """Migrate a server lively to a new host."""
+        super(ComputeCellsAPI, self).live_migrate(context,
+            instance, block_migration, disk_over_commit, host_name)
+
+        self._cast_to_cells(context, instance, 'live_migrate',
+                            block_migration, disk_over_commit, host_name)
+
 
 class HostAPI(compute_api.HostAPI):
     """HostAPI() class for cells.
diff --git a/nova/compute/flavors.py b/nova/compute/flavors.py
index 2958769e1..58dcd3fa5 100644
--- a/nova/compute/flavors.py
+++ b/nova/compute/flavors.py
@@ -123,10 +123,11 @@ def create(name, memory, vcpus, root_gb, ephemeral_gb=0, flavorid=None,
     kwargs['flavorid'] = unicode(flavorid)
 
     # ensure is_public attribute is boolean
-    if not utils.is_valid_boolstr(is_public):
-        msg = _("is_public must be a boolean")
-        raise exception.InvalidInput(reason=msg)
-    kwargs['is_public'] = strutils.bool_from_string(is_public)
+    try:
+        kwargs['is_public'] = strutils.bool_from_string(
+            is_public, strict=True)
+    except ValueError:
+        raise exception.InvalidInput(reason=_("is_public must be a boolean"))
 
     try:
         return db.instance_type_create(context.get_admin_context(), kwargs)
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 02527913a..91a814f98 100755
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -393,15 +393,17 @@ class ComputeManager(manager.SchedulerDependentManager):
                         'trying to set it to ERROR'),
                       instance_uuid=instance_uuid)
 
-    def _get_instances_on_driver(self, context):
+    def _get_instances_on_driver(self, context, filters=None):
         """Return a list of instance records that match the instances found
         on the hypervisor.
         """
+        if not filters:
+            filters = {}
         try:
             driver_uuids = self.driver.list_instance_uuids()
+            filters['uuid'] = driver_uuids
             local_instances = self.conductor_api.instance_get_all_by_filters(
-                    context, {'uuid': driver_uuids},
-                    columns_to_join=[])
+                    context, filters, columns_to_join=[])
             local_instance_uuids = [inst['uuid'] for inst in local_instances]
             for uuid in set(driver_uuids) - set(local_instance_uuids):
                 LOG.error(_('Instance %(uuid)s found in the hypervisor, but '
@@ -413,8 +415,8 @@ class ComputeManager(manager.SchedulerDependentManager):
         # The driver doesn't support uuids listing, so we'll have
         # to brute force.
         driver_instances = self.driver.list_instances()
-        instances = self.conductor_api.instance_get_all_by_host(
-            context, self.host, columns_to_join=[])
+        instances = self.conductor_api.instance_get_all_by_filters(
+            context, filters, columns_to_join=[])
         name_map = dict((instance['name'], instance) for instance in instances)
         local_instances = []
         for driver_instance in driver_instances:
@@ -436,11 +438,11 @@ class ComputeManager(manager.SchedulerDependentManager):
         not, destroy them.
         """
         our_host = self.host
-        local_instances = self._get_instances_on_driver(context)
+        filters = {'deleted': False}
+        local_instances = self._get_instances_on_driver(context, filters)
         for instance in local_instances:
             instance_host = instance['host']
-            instance_name = instance['name']
-            if instance['host'] != our_host:
+            if instance_host != our_host:
                 LOG.info(_('Deleting instance as its host ('
                            '%(instance_host)s) is not equal to our '
                            'host (%(our_host)s).'),
@@ -1104,13 +1106,10 @@ class ComputeManager(manager.SchedulerDependentManager):
             return {}
 
         try:
-            size_bytes = image_meta['size']
-        except KeyError:
-            # Size is not a required field in the image service (yet), so
-            # we are unable to rely on it being there even though it's in
-            # glance.
-
-            # TODO(jk0): Should size be required in the image service?
+            size_bytes = int(image_meta['size'])
+        except (KeyError, TypeError, ValueError):
+            # Disregard missing field or bad data rather than put the instance
+            # into an ERROR state that can't be communicated back to the user
             return image_meta
 
         instance_type = flavors.extract_instance_type(instance)
@@ -3189,6 +3188,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         return self.driver.check_can_live_migrate_source(ctxt, instance,
                                                          dest_check_data)
 
+    @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
     def pre_live_migration(self, context, instance,
                            block_migration=False, disk=None,
                            migrate_data=None):
@@ -3207,6 +3207,9 @@ class ComputeManager(manager.SchedulerDependentManager):
                             context, instance, bdms=bdms)
 
         network_info = self._get_instance_nw_info(context, instance)
+        self._notify_about_instance_usage(
+                     context, instance, "live_migration.pre.start",
+                     network_info=network_info)
 
         # TODO(tr3buchet): figure out how on the earth this is necessary
         fixed_ips = network_info.fixed_ips()
@@ -3237,8 +3240,13 @@ class ComputeManager(manager.SchedulerDependentManager):
         if block_migration:
             self.driver.pre_block_migration(context, instance, disk)
 
+        self._notify_about_instance_usage(
+                     context, instance, "live_migration.pre.end",
+                     network_info=network_info)
+
         return pre_live_migration_data
 
+    @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
     def live_migration(self, context, dest, instance,
                        block_migration=False, migrate_data=None):
         """Executing live migration.
@@ -3355,6 +3363,7 @@ class ComputeManager(manager.SchedulerDependentManager):
                    "This error can be safely ignored."),
                  instance=instance_ref)
 
+    @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
     def post_live_migration_at_destination(self, context, instance,
                                            block_migration=False):
         """Post operations for live migration .
@@ -3380,6 +3389,9 @@ class ComputeManager(manager.SchedulerDependentManager):
                                                            migration)
 
         network_info = self._get_instance_nw_info(context, instance)
+        self._notify_about_instance_usage(
+                     context, instance, "live_migration.post.dest.start",
+                     network_info=network_info)
         block_device_info = self._get_instance_volume_block_device_info(
                             context, instance)
 
@@ -3403,6 +3415,9 @@ class ComputeManager(manager.SchedulerDependentManager):
 
         # NOTE(vish): this is necessary to update dhcp
         self.network_api.setup_networks_on_host(context, instance, self.host)
+        self._notify_about_instance_usage(
+                     context, instance, "live_migration.post.dest.end",
+                     network_info=network_info)
 
     def _rollback_live_migration(self, context, instance,
                                  dest, block_migration, migrate_data=None):
@@ -3446,6 +3461,7 @@ class ComputeManager(manager.SchedulerDependentManager):
             self.compute_rpcapi.rollback_live_migration_at_destination(context,
                     instance, dest)
 
+    @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
     def rollback_live_migration_at_destination(self, context, instance):
         """Cleaning up image directory that is created pre_live_migration.
 
@@ -3453,6 +3469,9 @@ class ComputeManager(manager.SchedulerDependentManager):
         :param instance: an Instance dict sent over rpc
         """
         network_info = self._get_instance_nw_info(context, instance)
+        self._notify_about_instance_usage(
+                      context, instance, "live_migration.rollback.dest.start",
+                      network_info=network_info)
 
         # NOTE(tr3buchet): tear down networks on destination host
         self.network_api.setup_networks_on_host(context, instance,
@@ -3464,6 +3483,9 @@ class ComputeManager(manager.SchedulerDependentManager):
                             context, instance)
         self.driver.destroy(instance, self._legacy_nw_info(network_info),
                             block_device_info)
+        self._notify_about_instance_usage(
+                        context, instance, "live_migration.rollback.dest.end",
+                        network_info=network_info)
 
     @periodic_task.periodic_task
     def _heal_instance_info_cache(self, context):
@@ -3521,21 +3543,26 @@ class ComputeManager(manager.SchedulerDependentManager):
     @periodic_task.periodic_task
     def _poll_rebooting_instances(self, context):
         if CONF.reboot_timeout > 0:
-            instances = self.conductor_api.instance_get_all_hung_in_rebooting(
-                context, CONF.reboot_timeout)
-            self.driver.poll_rebooting_instances(CONF.reboot_timeout,
-                                                 instances)
+            filters = {'task_state': task_states.REBOOTING,
+                       'host': self.host}
+            rebooting = self.conductor_api.instance_get_all_by_filters(
+                context, filters, columns_to_join=[])
+
+            to_poll = []
+            for instance in rebooting:
+                if timeutils.is_older_than(instance['updated_at'],
+                                           CONF.reboot_timeout):
+                    to_poll.append(instance)
+
+            self.driver.poll_rebooting_instances(CONF.reboot_timeout, to_poll)
 
     @periodic_task.periodic_task
     def _poll_rescued_instances(self, context):
         if CONF.rescue_timeout > 0:
-            instances = self.conductor_api.instance_get_all_by_host(
-                context, self.host, columns_to_join=[])
-
-            rescued_instances = []
-            for instance in instances:
-                if instance['vm_state'] == vm_states.RESCUED:
-                    rescued_instances.append(instance)
+            filters = {'vm_state': vm_states.RESCUED,
+                       'host': self.host}
+            rescued_instances = self.conductor_api.instance_get_all_by_filters(
+                context, filters, columns_to_join=[])
 
             to_unrescue = []
             for instance in rescued_instances:
@@ -3971,23 +3998,15 @@ class ComputeManager(manager.SchedulerDependentManager):
             LOG.debug(_("CONF.reclaim_instance_interval <= 0, skipping..."))
             return
 
-        instances = self.conductor_api.instance_get_all_by_host(
-            context, self.host, columns_to_join=[])
+        filters = {'vm_state': vm_states.SOFT_DELETED,
+                   'host': self.host}
+        instances = self.conductor_api.instance_get_all_by_filters(context,
+                                                                   filters)
         for instance in instances:
-            old_enough = (not instance['deleted_at'] or
-                          timeutils.is_older_than(instance['deleted_at'],
-                                                  interval))
-            soft_deleted = instance['vm_state'] == vm_states.SOFT_DELETED
-
-            if soft_deleted and old_enough:
+            if self._deleted_old_enough(instance, interval):
                 capi = self.conductor_api
                 bdms = capi.block_device_mapping_get_all_by_instance(
                     context, instance)
-                # NOTE(danms): We fetched instances above without the
-                # system_metadata for efficiency. If we get here, we need
-                # to re-fetch with it so that _delete_instace() can extract
-                # instance_type information.
-                instance = capi.instance_get_by_uuid(context, instance['uuid'])
                 LOG.info(_('Reclaiming deleted instance'), instance=instance)
                 # NOTE(comstud): Quotas were already accounted for when
                 # the instance was soft deleted, so there's no need to
@@ -4090,18 +4109,15 @@ class ComputeManager(manager.SchedulerDependentManager):
         but the hypervisor thinks is still running.
         """
         timeout = CONF.running_deleted_instance_timeout
+        filters = {'deleted': True,
+                   'soft_deleted': False,
+                   'host': self.host}
+        instances = self._get_instances_on_driver(context, filters)
+        return [i for i in instances if self._deleted_old_enough(i, timeout)]
 
-        def deleted_instance(instance):
-            erroneously_running = instance['deleted']
-            old_enough = (not instance['deleted_at'] or
-                          timeutils.is_older_than(instance['deleted_at'],
-                                                  timeout))
-            if erroneously_running and old_enough:
-                return True
-            return False
-
-        instances = self._get_instances_on_driver(context)
-        return [i for i in instances if deleted_instance(i)]
+    def _deleted_old_enough(self, instance, timeout):
+        return (not instance['deleted_at'] or
+                timeutils.is_older_than(instance['deleted_at'], timeout))
 
     @contextlib.contextmanager
     def _error_out_instance_on_exception(self, context, instance_uuid,
@@ -4168,8 +4184,6 @@ class ComputeManager(manager.SchedulerDependentManager):
         if CONF.image_cache_manager_interval == 0:
             return
 
-        all_instances = self.conductor_api.instance_get_all(context)
-
         # Determine what other nodes use this storage
         storage_users.register_storage_use(CONF.instances_path, CONF.host)
         nodes = storage_users.get_storage_users(CONF.instances_path)
@@ -4179,9 +4193,10 @@ class ComputeManager(manager.SchedulerDependentManager):
         # TODO(mikal): this should be further refactored so that the cache
         # cleanup code doesn't know what those instances are, just a remote
         # count, and then this logic should be pushed up the stack.
-        filtered_instances = []
-        for instance in all_instances:
-            if instance['host'] in nodes:
-                filtered_instances.append(instance)
+        filters = {'deleted': False,
+                   'soft_deleted': True,
+                   'host': nodes}
+        filtered_instances = self.conductor_api.instance_get_all_by_filters(
+            context, filters, columns_to_join=[])
 
         self.driver.manage_image_cache(context, filtered_instances)
diff --git a/nova/conductor/api.py b/nova/conductor/api.py
index e8fcc2c2c..6706440f5 100644
--- a/nova/conductor/api.py
+++ b/nova/conductor/api.py
@@ -72,9 +72,6 @@ class LocalAPI(object):
     def instance_destroy(self, context, instance):
         return self._manager.instance_destroy(context, instance)
 
-    def instance_get_all(self, context):
-        return self._manager.instance_get_all(context)
-
     def instance_get_all_by_host(self, context, host, columns_to_join=None):
         return self._manager.instance_get_all_by_host(
             context, host, columns_to_join=columns_to_join)
@@ -92,10 +89,6 @@ class LocalAPI(object):
                                                          sort_dir,
                                                          columns_to_join)
 
-    def instance_get_all_hung_in_rebooting(self, context, timeout):
-        return self._manager.instance_get_all_hung_in_rebooting(context,
-                                                                timeout)
-
     def instance_get_active_by_window_joined(self, context, begin, end=None,
                                              project_id=None, host=None):
         return self._manager.instance_get_active_by_window_joined(
@@ -398,9 +391,6 @@ class API(object):
                                                           instance_uuid,
                                                           columns_to_join)
 
-    def instance_get_all(self, context):
-        return self.conductor_rpcapi.instance_get_all(context)
-
     def instance_get_all_by_host(self, context, host, columns_to_join=None):
         return self.conductor_rpcapi.instance_get_all_by_host(
             context, host, columns_to_join=columns_to_join)
@@ -416,10 +406,6 @@ class API(object):
         return self.conductor_rpcapi.instance_get_all_by_filters(
             context, filters, sort_key, sort_dir, columns_to_join)
 
-    def instance_get_all_hung_in_rebooting(self, context, timeout):
-        return self.conductor_rpcapi.instance_get_all_hung_in_rebooting(
-            context, timeout)
-
     def instance_get_active_by_window_joined(self, context, begin, end=None,
                                              project_id=None, host=None):
         return self.conductor_rpcapi.instance_get_active_by_window_joined(
diff --git a/nova/conductor/manager.py b/nova/conductor/manager.py
index fad849043..a45c83b8d 100644
--- a/nova/conductor/manager.py
+++ b/nova/conductor/manager.py
@@ -111,6 +111,7 @@ class ConductorManager(manager.Manager):
             self.db.instance_get_by_uuid(context, instance_uuid,
                 columns_to_join))
 
+    # NOTE(hanlind): This method can be removed in v2.0 of the RPC API.
     def instance_get_all(self, context):
         return jsonutils.to_primitive(self.db.instance_get_all(context))
 
@@ -269,6 +270,7 @@ class ConductorManager(manager.Manager):
             columns_to_join=columns_to_join)
         return jsonutils.to_primitive(result)
 
+    # NOTE(hanlind): This method can be removed in v2.0 of the RPC API.
     def instance_get_all_hung_in_rebooting(self, context, timeout):
         result = self.db.instance_get_all_hung_in_rebooting(context, timeout)
         return jsonutils.to_primitive(result)
diff --git a/nova/conductor/rpcapi.py b/nova/conductor/rpcapi.py
index e86a0acaa..c9be5dd79 100644
--- a/nova/conductor/rpcapi.py
+++ b/nova/conductor/rpcapi.py
@@ -251,11 +251,6 @@ class ConductorAPI(nova.openstack.common.rpc.proxy.RpcProxy):
                             sort_dir=sort_dir, columns_to_join=columns_to_join)
         return self.call(context, msg, version='1.47')
 
-    def instance_get_all_hung_in_rebooting(self, context, timeout):
-        msg = self.make_msg('instance_get_all_hung_in_rebooting',
-                            timeout=timeout)
-        return self.call(context, msg, version='1.15')
-
     def instance_get_active_by_window_joined(self, context, begin, end=None,
                                              project_id=None, host=None):
         msg = self.make_msg('instance_get_active_by_window_joined',
@@ -299,10 +294,6 @@ class ConductorAPI(nova.openstack.common.rpc.proxy.RpcProxy):
                             binary=binary)
         return self.call(context, msg, version='1.28')
 
-    def instance_get_all(self, context):
-        msg = self.make_msg('instance_get_all')
-        return self.call(context, msg, version='1.23')
-
     def instance_get_all_by_host(self, context, host, node=None,
                                  columns_to_join=None):
         msg = self.make_msg('instance_get_all_by_host', host=host, node=node,
diff --git a/nova/db/api.py b/nova/db/api.py
index d294ee1d7..677ed771b 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -654,6 +654,7 @@ def instance_floating_address_get_all(context, instance_uuid):
     return IMPL.instance_floating_address_get_all(context, instance_uuid)
 
 
+# NOTE(hanlind): This method can be removed as conductor RPC API moves to v2.0.
 def instance_get_all_hung_in_rebooting(context, reboot_window):
     """Get all instances stuck in a rebooting state."""
     return IMPL.instance_get_all_hung_in_rebooting(context, reboot_window)
@@ -718,22 +719,13 @@ def instance_info_cache_get(context, instance_uuid):
     return IMPL.instance_info_cache_get(context, instance_uuid)
 
 
-def instance_info_cache_update(context, instance_uuid, values,
-        update_cells=True):
+def instance_info_cache_update(context, instance_uuid, values):
     """Update an instance info cache record in the table.
 
     :param instance_uuid: = uuid of info cache's instance
     :param values: = dict containing column values to update
     """
-    rv = IMPL.instance_info_cache_update(context, instance_uuid, values)
-    if update_cells:
-        try:
-            cells_rpcapi.CellsAPI().instance_info_cache_update_at_top(
-                    context, rv)
-        except Exception:
-            LOG.exception(_("Failed to notify cells of instance info "
-                            "cache update"))
-    return rv
+    return IMPL.instance_info_cache_update(context, instance_uuid, values)
 
 
 def instance_info_cache_delete(context, instance_uuid):
@@ -911,6 +903,11 @@ def quota_class_get(context, class_name, resource):
     return IMPL.quota_class_get(context, class_name, resource)
 
 
+def quota_class_get_default(context):
+    """Retrieve all default quotas."""
+    return IMPL.quota_class_get_default(context)
+
+
 def quota_class_get_all_by_name(context, class_name):
     """Retrieve all quotas associated with a given quota class."""
     return IMPL.quota_class_get_all_by_name(context, class_name)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 2205ac7fa..0542a4c76 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -81,6 +81,7 @@ get_session = db_session.get_session
 
 
 _SHADOW_TABLE_PREFIX = 'shadow_'
+_DEFAULT_QUOTA_NAME = 'default'
 
 
 def get_backend():
@@ -95,6 +96,7 @@ def require_admin_context(f):
 
     """
 
+    @functools.wraps(f)
     def wrapper(*args, **kwargs):
         nova.context.require_admin_context(args[0])
         return f(*args, **kwargs)
@@ -112,6 +114,7 @@ def require_context(f):
 
     """
 
+    @functools.wraps(f)
     def wrapper(*args, **kwargs):
         nova.context.require_context(args[0])
         return f(*args, **kwargs)
@@ -1636,7 +1639,37 @@ def instance_get_all_by_filters(context, filters, sort_key, sort_dir,
                                 session=None):
     """Return instances that match all filters.  Deleted instances
     will be returned by default, unless there's a filter that says
-    otherwise"""
+    otherwise.
+
+    Depending on the name of a filter, matching for that filter is
+    performed using either exact matching or as regular expression
+    matching. Exact matching is applied for the following filters:
+
+        ['project_id', 'user_id', 'image_ref',
+         'vm_state', 'instance_type_id', 'uuid',
+         'metadata', 'host']
+
+
+    A third type of filter (also using exact matching), filters
+    based on instance metadata tags when supplied under a special
+    key named 'filter'.
+
+        filters = {
+            'filter': [
+                {'name': 'tag-key', 'value': '<metakey>'},
+                {'name': 'tag-value', 'value': '<metaval>'},
+                {'name': 'tag:<metakey>', 'value': '<metaval>'}
+            ]
+        }
+
+    Special keys are used to tweek the query further:
+
+        'changes-since' - only return instances updated after
+        'deleted' - only return (or exclude) deleted instances
+        'soft-deleted' - modify behavior of 'deleted' to either
+                         include or exclude instances whose
+                         vm_state is SOFT_DELETED.
+    """
 
     sort_fn = {'desc': desc, 'asc': asc}
 
@@ -1669,12 +1702,21 @@ def instance_get_all_by_filters(context, filters, sort_key, sort_dir,
         # Instances can be soft or hard deleted and the query needs to
         # include or exclude both
         if filters.pop('deleted'):
-            deleted = or_(models.Instance.deleted == models.Instance.id,
-                          models.Instance.vm_state == vm_states.SOFT_DELETED)
-            query_prefix = query_prefix.filter(deleted)
+            if filters.pop('soft_deleted', False):
+                query_prefix = query_prefix.\
+                    filter(models.Instance.deleted == models.Instance.id)
+            else:
+                deleted = or_(
+                    models.Instance.deleted == models.Instance.id,
+                    models.Instance.vm_state == vm_states.SOFT_DELETED
+                    )
+                query_prefix = query_prefix.\
+                    filter(deleted)
         else:
             query_prefix = query_prefix.\
-                    filter_by(deleted=0).\
+                    filter_by(deleted=0)
+            if not filters.pop('soft_deleted', False):
+                query_prefix = query_prefix.\
                     filter(models.Instance.vm_state != vm_states.SOFT_DELETED)
 
     if not context.is_admin:
@@ -1688,7 +1730,7 @@ def instance_get_all_by_filters(context, filters, sort_key, sort_dir,
     # For other filters that don't match this, we will do regexp matching
     exact_match_filter_names = ['project_id', 'user_id', 'image_ref',
                                 'vm_state', 'instance_type_id', 'uuid',
-                                'metadata']
+                                'metadata', 'host']
 
     # Filter the query
     query_prefix = exact_filter(query_prefix, models.Instance,
@@ -1934,6 +1976,7 @@ def instance_floating_address_get_all(context, instance_uuid):
     return [floating_ip.address for floating_ip in floating_ips]
 
 
+# NOTE(hanlind): This method can be removed as conductor RPC API moves to v2.0.
 @require_admin_context
 def instance_get_all_hung_in_rebooting(context, reboot_window):
     reboot_window = (timeutils.utcnow() -
@@ -2577,6 +2620,18 @@ def quota_class_get(context, class_name, resource):
     return result
 
 
+def quota_class_get_default(context):
+    rows = model_query(context, models.QuotaClass, read_deleted="no").\
+                   filter_by(class_name=_DEFAULT_QUOTA_NAME).\
+                   all()
+
+    result = {'class_name': _DEFAULT_QUOTA_NAME}
+    for row in rows:
+        result[row.resource] = row.hard_limit
+
+    return result
+
+
 @require_context
 def quota_class_get_all_by_name(context, class_name):
     nova.context.authorize_quota_class_context(context, class_name)
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py b/nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py
index 1b688a883..a24cabb2f 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py
@@ -38,7 +38,7 @@ def MediumText():
 
 def _populate_instance_types(instance_types_table):
     default_inst_types = {
-        'm1.tiny': dict(mem=512, vcpus=1, root_gb=0, eph_gb=0, flavid=1),
+        'm1.tiny': dict(mem=512, vcpus=1, root_gb=1, eph_gb=0, flavid=1),
         'm1.small': dict(mem=2048, vcpus=1, root_gb=20, eph_gb=0, flavid=2),
         'm1.medium': dict(mem=4096, vcpus=2, root_gb=40, eph_gb=0, flavid=3),
         'm1.large': dict(mem=8192, vcpus=4, root_gb=80, eph_gb=0, flavid=4),
diff --git a/nova/hacking/__init__.py b/nova/hacking/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/nova/hacking/__init__.py
diff --git a/nova/hacking/checks.py b/nova/hacking/checks.py
new file mode 100644
index 000000000..49fbf15f4
--- /dev/null
+++ b/nova/hacking/checks.py
@@ -0,0 +1,31 @@
+# Copyright (c) 2012, Cloudscaling
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+
+def import_no_db_in_virt(logical_line, filename):
+    """Check for db calls from nova/virt
+
+    As of grizzly-2 all the database calls have been removed from
+    nova/virt, and we want to keep it that way.
+
+    N307
+    """
+    if "nova/virt" in filename and not filename.endswith("fake.py"):
+        if logical_line.startswith("from nova import db"):
+            yield (0, "N307: nova.db import not allowed in nova/virt/*")
+
+
+def factory(register):
+    register(import_no_db_in_virt)
diff --git a/nova/locale/bg_BG/LC_MESSAGES/nova.po b/nova/locale/bg_BG/LC_MESSAGES/nova.po
new file mode 100644
index 000000000..b113175aa
--- /dev/null
+++ b/nova/locale/bg_BG/LC_MESSAGES/nova.po
@@ -0,0 +1,10978 @@
+# English (United States) translations for nova.
+# Copyright (C) 2012 ORGANIZATION
+# This file is distributed under the same license as the nova project.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version:  Nova\n"
+"Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
+"POT-Creation-Date: 2013-05-22 19:37+0000\n"
+"PO-Revision-Date: 2013-05-18 19:07+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language-Team: Bulgarian (Bulgaria) "
+"(http://www.transifex.com/projects/p/openstack/language/bg_BG/)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#: nova/block_device.py:167 nova/virt/hyperv/basevolumeutils.py:91
+#, python-format
+msgid "block_device_list %s"
+msgstr ""
+
+#: nova/context.py:63
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:108
+#, python-format
+msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
+msgstr ""
+
+#: nova/crypto.py:55
+msgid "Filename of root CA"
+msgstr ""
+
+#: nova/crypto.py:58
+msgid "Filename of private key"
+msgstr ""
+
+#: nova/crypto.py:61
+msgid "Filename of root Certificate Revocation List"
+msgstr ""
+
+#: nova/crypto.py:64
+msgid "Where we keep our keys"
+msgstr ""
+
+#: nova/crypto.py:67
+msgid "Where we keep our root CA"
+msgstr ""
+
+#: nova/crypto.py:70
+msgid "Should we use a CA for each project?"
+msgstr ""
+
+#: nova/crypto.py:74
+#, python-format
+msgid "Subject for certificate for users, %s for project, user, timestamp"
+msgstr ""
+
+#: nova/crypto.py:79
+#, python-format
+msgid "Subject for certificate for projects, %s for project, timestamp"
+msgstr ""
+
+#: nova/crypto.py:210
+msgid "Unable to find the key"
+msgstr ""
+
+#: nova/crypto.py:393
+msgid "Failed to write inbound.csr"
+msgstr ""
+
+#: nova/crypto.py:395
+#, python-format
+msgid "Flags path: %s"
+msgstr ""
+
+#: nova/exception.py:112
+msgid "An unknown exception occurred."
+msgstr ""
+
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+msgid "Exception in string format operation"
+msgstr ""
+
+#: nova/exception.py:153
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:163
+#, python-format
+msgid "Failed to encrypt text: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:167
+#, python-format
+msgid "Failed to decrypt text: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:171
+msgid "Virtual Interface creation failed"
+msgstr ""
+
+#: nova/exception.py:175
+msgid "5 attempts to create virtual interfacewith unique mac address failed"
+msgstr ""
+
+#: nova/exception.py:180
+#, python-format
+msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:185
+msgid "Not authorized."
+msgstr ""
+
+#: nova/exception.py:190
+msgid "User does not have admin privileges"
+msgstr ""
+
+#: nova/exception.py:194
+#, python-format
+msgid "Policy doesn't allow %(action)s to be performed."
+msgstr ""
+
+#: nova/exception.py:198
+#, python-format
+msgid "Image %(image_id)s is not active."
+msgstr ""
+
+#: nova/exception.py:202
+#, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr ""
+
+#: nova/exception.py:206
+msgid "Unacceptable parameters."
+msgstr ""
+
+#: nova/exception.py:211
+msgid "Block Device Mapping is Invalid."
+msgstr ""
+
+#: nova/exception.py:215
+#, python-format
+msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
+msgstr ""
+
+#: nova/exception.py:220
+#, python-format
+msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
+msgstr ""
+
+#: nova/exception.py:225
+#, python-format
+msgid "Volume %(volume_id)s is not attached to anything"
+msgstr ""
+
+#: nova/exception.py:229
+#, python-format
+msgid ""
+"Volume %(volume_id)s did not finish being created even after we waited "
+"%(seconds)s seconds or %(attempts)s attempts."
+msgstr ""
+
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
+msgid "Keypair data is invalid"
+msgstr ""
+
+#: nova/exception.py:239
+msgid "The request is invalid."
+msgstr ""
+
+#: nova/exception.py:243
+msgid "Invalid input received"
+msgstr ""
+
+#: nova/exception.py:247
+msgid "Invalid volume"
+msgstr ""
+
+#: nova/exception.py:251 nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/contrib/admin_actions.py:242
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/exception.py:255
+msgid "Invalid metadata size"
+msgstr ""
+
+#: nova/exception.py:259
+#, python-format
+msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
+msgstr ""
+
+#: nova/exception.py:263
+#, python-format
+msgid "Invalid IP protocol %(protocol)s."
+msgstr ""
+
+#: nova/exception.py:267
+#, python-format
+msgid "Invalid content type %(content_type)s."
+msgstr ""
+
+#: nova/exception.py:271
+#, python-format
+msgid "Invalid cidr %(cidr)s."
+msgstr ""
+
+#: nova/exception.py:275 nova/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: nova/exception.py:282
+#, python-format
+msgid "%(err)s"
+msgstr ""
+
+#: nova/exception.py:286
+#, python-format
+msgid ""
+"Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
+" %(reason)s."
+msgstr ""
+
+#: nova/exception.py:291
+#, python-format
+msgid "Group not valid. Reason: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:295 nova/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: nova/exception.py:299
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
+" the instance is in this state."
+msgstr ""
+
+#: nova/exception.py:304
+#, python-format
+msgid "Instance %(instance_id)s is not running."
+msgstr ""
+
+#: nova/exception.py:308
+#, python-format
+msgid "Instance %(instance_id)s is not in rescue mode"
+msgstr ""
+
+#: nova/exception.py:312
+#, python-format
+msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:316
+#, python-format
+msgid "Instance %(instance_id)s is not ready"
+msgstr ""
+
+#: nova/exception.py:320
+msgid "Failed to suspend instance"
+msgstr ""
+
+#: nova/exception.py:324
+#, python-format
+msgid "Failed to resume instance: %(reason)s."
+msgstr ""
+
+#: nova/exception.py:328
+#, python-format
+msgid "Failed to power on instance: %(reason)s."
+msgstr ""
+
+#: nova/exception.py:332
+#, python-format
+msgid "Failed to power off instance: %(reason)s."
+msgstr ""
+
+#: nova/exception.py:336
+msgid "Failed to reboot instance"
+msgstr ""
+
+#: nova/exception.py:340
+msgid "Failed to terminate instance"
+msgstr ""
+
+#: nova/exception.py:344
+msgid "Failed to deploy instance"
+msgstr ""
+
+#: nova/exception.py:348
+msgid "Service is unavailable at this time."
+msgstr ""
+
+#: nova/exception.py:352
+msgid "Insufficient compute resources."
+msgstr ""
+
+#: nova/exception.py:356
+#, python-format
+msgid "Compute service of %(host)s is unavailable at this time."
+msgstr ""
+
+#: nova/exception.py:360
+#, python-format
+msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
+msgstr ""
+
+#: nova/exception.py:365
+msgid "The supplied hypervisor type of is invalid."
+msgstr ""
+
+#: nova/exception.py:369
+msgid "The instance requires a newer hypervisor version than has been provided."
+msgstr ""
+
+#: nova/exception.py:374
+#, python-format
+msgid ""
+"The supplied disk path (%(path)s) already exists, it is expected not to "
+"exist."
+msgstr ""
+
+#: nova/exception.py:379
+#, python-format
+msgid "The supplied device path (%(path)s) is invalid."
+msgstr ""
+
+#: nova/exception.py:383
+#, python-format
+msgid "The supplied device path (%(path)s) is in use."
+msgstr ""
+
+#: nova/exception.py:388
+#, python-format
+msgid "The supplied device (%(device)s) is busy."
+msgstr ""
+
+#: nova/exception.py:392
+msgid "Unacceptable CPU info"
+msgstr ""
+
+#: nova/exception.py:396
+#, python-format
+msgid "%(address)s is not a valid IP v4/6 address."
+msgstr ""
+
+#: nova/exception.py:400
+#, python-format
+msgid ""
+"VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
+"tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
+msgstr ""
+
+#: nova/exception.py:406
+#, python-format
+msgid ""
+"vSwitch which contains the port group %(bridge)s is not associated with "
+"the desired physical adapter. Expected vSwitch is %(expected)s, but the "
+"one associated is %(actual)s."
+msgstr ""
+
+#: nova/exception.py:413
+#, python-format
+msgid "Disk format %(disk_format)s is not acceptable"
+msgstr ""
+
+#: nova/exception.py:417
+#, python-format
+msgid "Image %(image_id)s is unacceptable: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:421
+#, python-format
+msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:425
+#, python-format
+msgid "Ec2 id %(ec2_id)s is unacceptable."
+msgstr ""
+
+#: nova/exception.py:429
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
+msgstr ""
+
+#: nova/exception.py:433
+#, python-format
+msgid "Invalid ID received %(id)s."
+msgstr ""
+
+#: nova/exception.py:437
+msgid "Constraint not met."
+msgstr ""
+
+#: nova/exception.py:442
+msgid "Resource could not be found."
+msgstr ""
+
+#: nova/exception.py:447
+#, python-format
+msgid "No agent-build associated with id %(id)s."
+msgstr ""
+
+#: nova/exception.py:451
+#, python-format
+msgid "Volume %(volume_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:455
+#, python-format
+msgid "Snapshot %(snapshot_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:459
+#, python-format
+msgid "No target id found for volume %(volume_id)s."
+msgstr ""
+
+#: nova/exception.py:463
+#, python-format
+msgid "No disk at %(location)s"
+msgstr ""
+
+#: nova/exception.py:467
+#, python-format
+msgid "Could not find a handler for %(driver_type)s volume."
+msgstr ""
+
+#: nova/exception.py:471
+#, python-format
+msgid "Invalid image href %(image_href)s."
+msgstr ""
+
+#: nova/exception.py:475
+#, python-format
+msgid "Image %(image_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:479
+#, python-format
+msgid ""
+"Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
+" dynamically when they are listed for the first time. Have you listed "
+"image ids since adding this image?"
+msgstr ""
+
+#: nova/exception.py:486
+#, python-format
+msgid "Project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:490
+msgid "Cannot find SR to read/write VDI."
+msgstr ""
+
+#: nova/exception.py:494
+#, python-format
+msgid "Network %(network_id)s is duplicated."
+msgstr ""
+
+#: nova/exception.py:498
+#, python-format
+msgid "Network %(network_id)s is still in use."
+msgstr ""
+
+#: nova/exception.py:502
+#, python-format
+msgid "%(req)s is required to create a network."
+msgstr ""
+
+#: nova/exception.py:506
+#, python-format
+msgid "Network %(network_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:510
+#, python-format
+msgid "Port id %(port_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:514
+#, python-format
+msgid "Network could not be found for bridge %(bridge)s"
+msgstr ""
+
+#: nova/exception.py:518
+#, python-format
+msgid "Network could not be found for uuid %(uuid)s"
+msgstr ""
+
+#: nova/exception.py:522
+#, python-format
+msgid "Network could not be found with cidr %(cidr)s."
+msgstr ""
+
+#: nova/exception.py:526
+#, python-format
+msgid "Network could not be found for instance %(instance_id)s."
+msgstr ""
+
+#: nova/exception.py:530
+msgid "No networks defined."
+msgstr ""
+
+#: nova/exception.py:534
+#, python-format
+msgid ""
+"Either Network uuid %(network_uuid)s is not present or is not assigned to"
+" the project %(project_id)s."
+msgstr ""
+
+#: nova/exception.py:539
+msgid "Could not find the datastore reference(s) which the VM uses."
+msgstr ""
+
+#: nova/exception.py:543
+#, python-format
+msgid "Port %(port_id)s is still in use."
+msgstr ""
+
+#: nova/exception.py:547
+#, python-format
+msgid "Port %(port_id)s not usable for instance %(instance)s."
+msgstr ""
+
+#: nova/exception.py:551
+#, python-format
+msgid "No free port available for instance %(instance)s."
+msgstr ""
+
+#: nova/exception.py:555
+#, python-format
+msgid "No fixed IP associated with id %(id)s."
+msgstr ""
+
+#: nova/exception.py:559
+#, python-format
+msgid "Fixed ip not found for address %(address)s."
+msgstr ""
+
+#: nova/exception.py:563
+#, python-format
+msgid "Instance %(instance_uuid)s has zero fixed ips."
+msgstr ""
+
+#: nova/exception.py:567
+#, python-format
+msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
+msgstr ""
+
+#: nova/exception.py:572
+#, python-format
+msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
+msgstr ""
+
+#: nova/exception.py:576
+#, python-format
+msgid ""
+"Fixed IP address (%(address)s) does not exist in network "
+"(%(network_uuid)s)."
+msgstr ""
+
+#: nova/exception.py:581
+#, python-format
+msgid ""
+"Fixed IP address %(address)s is already in use on instance "
+"%(instance_uuid)s."
+msgstr ""
+
+#: nova/exception.py:586
+#, python-format
+msgid "More than one instance is associated with fixed ip address '%(address)s'."
+msgstr ""
+
+#: nova/exception.py:591
+#, python-format
+msgid "Fixed IP address %(address)s is invalid."
+msgstr ""
+
+#: nova/exception.py:595
+msgid "Zero fixed ips available."
+msgstr ""
+
+#: nova/exception.py:599
+msgid "Zero fixed ips could be found."
+msgstr ""
+
+#: nova/exception.py:608
+#, python-format
+msgid "Floating ip %(address)s already exists."
+msgstr ""
+
+#: nova/exception.py:612
+#, python-format
+msgid "Floating ip not found for id %(id)s."
+msgstr ""
+
+#: nova/exception.py:616
+#, python-format
+msgid "The DNS entry %(name)s already exists in domain %(domain)s."
+msgstr ""
+
+#: nova/exception.py:620
+#, python-format
+msgid "Floating ip not found for address %(address)s."
+msgstr ""
+
+#: nova/exception.py:624
+#, python-format
+msgid "Floating ip not found for host %(host)s."
+msgstr ""
+
+#: nova/exception.py:628
+#, python-format
+msgid "Multiple floating ips are found for address %(address)s."
+msgstr ""
+
+#: nova/exception.py:632
+msgid "Floating ip pool not found."
+msgstr ""
+
+#: nova/exception.py:637
+msgid "Zero floating ips available."
+msgstr ""
+
+#: nova/exception.py:642
+#, python-format
+msgid "Floating ip %(address)s is associated."
+msgstr ""
+
+#: nova/exception.py:646
+#, python-format
+msgid "Floating ip %(address)s is not associated."
+msgstr ""
+
+#: nova/exception.py:650
+msgid "Zero floating ips exist."
+msgstr ""
+
+#: nova/exception.py:654
+#, python-format
+msgid "Interface %(interface)s not found."
+msgstr ""
+
+#: nova/exception.py:658
+msgid "Cannot disassociate auto assigined floating ip"
+msgstr ""
+
+#: nova/exception.py:662
+#, python-format
+msgid "Keypair %(name)s not found for user %(user_id)s"
+msgstr ""
+
+#: nova/exception.py:666
+#, python-format
+msgid "Certificate %(certificate_id)s not found."
+msgstr ""
+
+#: nova/exception.py:670
+#, python-format
+msgid "Service %(service_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:674
+#, python-format
+msgid "Host %(host)s could not be found."
+msgstr ""
+
+#: nova/exception.py:678
+#, python-format
+msgid "Compute host %(host)s could not be found."
+msgstr ""
+
+#: nova/exception.py:682
+#, python-format
+msgid "Could not find binary %(binary)s on host %(host)s."
+msgstr ""
+
+#: nova/exception.py:686
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
+#: nova/exception.py:690
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:695
+msgid "Quota could not be found"
+msgstr ""
+
+#: nova/exception.py:699
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:703
+#, python-format
+msgid "Quota for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:707
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:711
+#, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:715
+#, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:719
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:723
+#, python-format
+msgid "Security group %(security_group_id)s not found."
+msgstr ""
+
+#: nova/exception.py:727
+#, python-format
+msgid "Security group %(security_group_id)s not found for project %(project_id)s."
+msgstr ""
+
+#: nova/exception.py:732
+#, python-format
+msgid "Security group with rule %(rule_id)s not found."
+msgstr ""
+
+#: nova/exception.py:736
+#, python-format
+msgid ""
+"Security group %(security_group_id)s is already associated with the "
+"instance %(instance_id)s"
+msgstr ""
+
+#: nova/exception.py:741
+#, python-format
+msgid ""
+"Security group %(security_group_id)s is not associated with the instance "
+"%(instance_id)s"
+msgstr ""
+
+#: nova/exception.py:746
+#, python-format
+msgid "Security group default rule (%rule_id)s not found."
+msgstr ""
+
+#: nova/exception.py:750
+msgid ""
+"Network requires port_security_enabled and subnet associated in order to "
+"apply security groups."
+msgstr ""
+
+#: nova/exception.py:755
+msgid "No Unique Match Found."
+msgstr ""
+
+#: nova/exception.py:760
+#, python-format
+msgid "Migration %(migration_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:764
+#, python-format
+msgid "Migration not found for instance %(instance_id)s with status %(status)s."
+msgstr ""
+
+#: nova/exception.py:769
+#, python-format
+msgid "Console pool %(pool_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:773
+#, python-format
+msgid ""
+"Console pool of type %(console_type)s for compute host %(compute_host)s "
+"on proxy host %(host)s not found."
+msgstr ""
+
+#: nova/exception.py:779
+#, python-format
+msgid "Console %(console_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:783
+#, python-format
+msgid "Console for instance %(instance_uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:787
+#, python-format
+msgid ""
+"Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
+"found."
+msgstr ""
+
+#: nova/exception.py:792
+#, python-format
+msgid "Invalid console type %(console_type)s"
+msgstr ""
+
+#: nova/exception.py:796
+#, python-format
+msgid "Instance type %(instance_type_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:800
+#, python-format
+msgid "Instance type with name %(instance_type_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:805
+#, python-format
+msgid "Flavor %(flavor_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:809
+#, python-format
+msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
+msgstr ""
+
+#: nova/exception.py:814
+#, python-format
+msgid "Cell %(cell_name)s doesn't exist."
+msgstr ""
+
+#: nova/exception.py:818
+#, python-format
+msgid "Inconsistency in cell routing: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:822
+#, python-format
+msgid "Service API method not found: %(detail)s"
+msgstr ""
+
+#: nova/exception.py:826
+msgid "Timeout waiting for response from cell"
+msgstr ""
+
+#: nova/exception.py:830
+#, python-format
+msgid "Cell message has reached maximum hop count: %(hop_count)s"
+msgstr ""
+
+#: nova/exception.py:834
+msgid "No cells available matching scheduling criteria."
+msgstr ""
+
+#: nova/exception.py:838
+#, python-format
+msgid "Exception received during cell processing: %(exc_name)s."
+msgstr ""
+
+#: nova/exception.py:842
+#, python-format
+msgid "Cell is not known for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/exception.py:846
+#, python-format
+msgid "Scheduler Host Filter %(filter_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:850
+#, python-format
+msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:855
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:860
+#, python-format
+msgid ""
+"Instance Type %(instance_type_id)s has no extra specs with key "
+"%(extra_specs_key)s."
+msgstr ""
+
+#: nova/exception.py:865
+#, python-format
+msgid "File %(file_path)s could not be found."
+msgstr ""
+
+#: nova/exception.py:869
+msgid "Zero files could be found."
+msgstr ""
+
+#: nova/exception.py:873
+#, python-format
+msgid "Virtual switch associated with the network adapter %(adapter)s not found."
+msgstr ""
+
+#: nova/exception.py:878
+#, python-format
+msgid "Network adapter %(adapter)s could not be found."
+msgstr ""
+
+#: nova/exception.py:882
+#, python-format
+msgid "Class %(class_name)s could not be found: %(exception)s"
+msgstr ""
+
+#: nova/exception.py:886
+msgid "Action not allowed."
+msgstr ""
+
+#: nova/exception.py:890
+msgid "Rotation is not allowed for snapshots"
+msgstr ""
+
+#: nova/exception.py:894
+msgid "Rotation param is required for backup image_type"
+msgstr ""
+
+#: nova/exception.py:898
+#, python-format
+msgid "Key pair %(key_name)s already exists."
+msgstr ""
+
+#: nova/exception.py:902
+#, python-format
+msgid "Instance %(name)s already exists."
+msgstr ""
+
+#: nova/exception.py:906
+#, python-format
+msgid "Instance Type with name %(name)s already exists."
+msgstr ""
+
+#: nova/exception.py:910
+#, python-format
+msgid "Instance Type with ID %(flavor_id)s already exists."
+msgstr ""
+
+#: nova/exception.py:914
+#, python-format
+msgid ""
+"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"%(project_id)s combination."
+msgstr ""
+
+#: nova/exception.py:919
+#, python-format
+msgid "%(path)s is not on shared storage: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:923
+#, python-format
+msgid "%(path)s is not on local storage: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:927
+msgid "Migration error"
+msgstr ""
+
+#: nova/exception.py:931
+msgid "Migration pre-check error"
+msgstr ""
+
+#: nova/exception.py:935
+#, python-format
+msgid "Malformed message body: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:941
+#, python-format
+msgid "Could not find config at %(path)s"
+msgstr ""
+
+#: nova/exception.py:945
+#, python-format
+msgid "Could not load paste app '%(name)s' from %(path)s"
+msgstr ""
+
+#: nova/exception.py:949
+msgid "When resizing, instances must change flavor!"
+msgstr ""
+
+#: nova/exception.py:953
+#, python-format
+msgid "Resize error: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:957
+msgid "Image is larger than instance type allows"
+msgstr ""
+
+#: nova/exception.py:961
+msgid "Instance type's memory is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:965
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:969
+#, python-format
+msgid "Insufficient free memory on compute node to start %(uuid)s."
+msgstr ""
+
+#: nova/exception.py:973
+msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
+msgstr ""
+
+#: nova/exception.py:977
+#, python-format
+msgid "No valid host was found. %(reason)s"
+msgstr ""
+
+#: nova/exception.py:981
+msgid "Quota exceeded"
+msgstr ""
+
+#: nova/exception.py:988
+#, python-format
+msgid ""
+"Quota exceeded for %(overs)s: Requested %(req)s, but already used "
+"%(used)d of %(allowed)d %(resource)s"
+msgstr ""
+
+#: nova/exception.py:993
+msgid "Maximum number of floating ips exceeded"
+msgstr ""
+
+#: nova/exception.py:997
+msgid "Maximum number of fixed ips exceeded"
+msgstr ""
+
+#: nova/exception.py:1001
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:1005
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:1009
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:1013
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:1017
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1021
+msgid "Maximum number of security groups or rules exceeded"
+msgstr ""
+
+#: nova/exception.py:1025
+#, python-format
+msgid ""
+"Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
+"%(reason)s."
+msgstr ""
+
+#: nova/exception.py:1030
+#, python-format
+msgid "Aggregate %(aggregate_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1034
+#, python-format
+msgid "Aggregate %(aggregate_name)s already exists."
+msgstr ""
+
+#: nova/exception.py:1038
+#, python-format
+msgid "Aggregate %(aggregate_id)s has no host %(host)s."
+msgstr ""
+
+#: nova/exception.py:1042
+#, python-format
+msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:1047
+#, python-format
+msgid "Aggregate %(aggregate_id)s already has host %(host)s."
+msgstr ""
+
+#: nova/exception.py:1051
+msgid "Unable to create instance type"
+msgstr ""
+
+#: nova/exception.py:1055
+#, python-format
+msgid "Failed to set admin password on %(instance)s because %(reason)s"
+msgstr ""
+
+#: nova/exception.py:1061
+#, python-format
+msgid "Detected existing vlan with id %(vlan)d"
+msgstr ""
+
+#: nova/exception.py:1065
+msgid "There was a conflict when trying to complete your request."
+msgstr ""
+
+#: nova/exception.py:1070
+#, python-format
+msgid "Instance %(instance_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1074
+#, python-format
+msgid "Info cache for instance %(instance_uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1079
+#, python-format
+msgid "Node %(node_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1083
+#, python-format
+msgid "Node with UUID %(node_uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1087
+#, python-format
+msgid "Marker %(marker)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1091
+#, python-format
+msgid "Invalid id: %(val)s (expecting \"i-...\")."
+msgstr ""
+
+#: nova/exception.py:1095
+#, python-format
+msgid "Could not fetch image %(image_id)s"
+msgstr ""
+
+#: nova/exception.py:1099
+#, python-format
+msgid "Could not upload image %(image_id)s"
+msgstr ""
+
+#: nova/exception.py:1103
+#, python-format
+msgid "Task %(task_name)s is already running on host %(host)s"
+msgstr ""
+
+#: nova/exception.py:1107
+#, python-format
+msgid "Task %(task_name)s is not running on host %(host)s"
+msgstr ""
+
+#: nova/exception.py:1111
+#, python-format
+msgid "Instance %(instance_uuid)s is locked"
+msgstr ""
+
+#: nova/exception.py:1115
+#, python-format
+msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
+msgstr ""
+
+#: nova/exception.py:1120
+#, python-format
+msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
+msgstr ""
+
+#: nova/exception.py:1125
+#, python-format
+msgid "Failed to attach network adapter device to %(instance)s"
+msgstr ""
+
+#: nova/exception.py:1129
+#, python-format
+msgid "Failed to detach network adapter device from  %(instance)s"
+msgstr ""
+
+#: nova/exception.py:1133
+#, python-format
+msgid ""
+"User data too large. User data must be no larger than %(maxsize)s bytes "
+"once base64 encoded. Your data is %(length)d bytes"
+msgstr ""
+
+#: nova/exception.py:1139
+msgid "User data needs to be valid base 64."
+msgstr ""
+
+#: nova/exception.py:1143
+#, python-format
+msgid ""
+"unexpected task state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1148
+#, python-format
+msgid ""
+"Action for request_id %(request_id)s on instance %(instance_uuid)s not "
+"found"
+msgstr ""
+
+#: nova/exception.py:1153
+#, python-format
+msgid "Event %(event)s not found for action id %(action_id)s"
+msgstr ""
+
+#: nova/exception.py:1157
+#, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
+msgid "The CA file for %(project)s could not be found"
+msgstr ""
+
+#: nova/exception.py:1166
+#, python-format
+msgid "The CRL file for %(project)s could not be found"
+msgstr ""
+
+#: nova/exception.py:1170
+msgid "Instance recreate is not implemented by this virt driver."
+msgstr ""
+
+#: nova/exception.py:1174
+#, python-format
+msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
+msgstr ""
+
+#: nova/exception.py:1179
+#, python-format
+msgid "%(binary)s attempted direct database access which is not allowed by policy"
+msgstr ""
+
+#: nova/exception.py:1184
+#, python-format
+msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
+msgstr ""
+
+#: nova/exception.py:1189
+#, python-format
+msgid ""
+"Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
+"driver"
+msgstr ""
+
+#: nova/exception.py:1194
+#, python-format
+msgid "Invalid Base 64 data for file %(path)s"
+msgstr ""
+
+#: nova/exception.py:1198
+#, python-format
+msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:1202
+#, python-format
+msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
+#: nova/hooks.py:62
+#, python-format
+msgid "Running %(name)s pre-hook: %(obj)s"
+msgstr ""
+
+#: nova/hooks.py:70
+#, python-format
+msgid "Running %(name)s post-hook: %(obj)s"
+msgstr ""
+
+#: nova/manager.py:170
+msgid "Notifying Schedulers of capabilities ..."
+msgstr ""
+
+#: nova/notifications.py:112 nova/notifications.py:152
+msgid "Failed to send state update notification"
+msgstr ""
+
+#: nova/notifications.py:232
+msgid "Failed to get nw_info"
+msgstr ""
+
+#: nova/policy.py:32
+msgid "JSON file representing policy"
+msgstr ""
+
+#: nova/policy.py:35
+msgid "Rule checked when requested rule is not found"
+msgstr ""
+
+#: nova/quota.py:972
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:994
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:996
+#, python-format
+msgid "Committed reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:1016
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:1018
+#, python-format
+msgid "Rolled back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:153
+#, python-format
+msgid "Starting %(topic)s node (version %(version)s)"
+msgstr ""
+
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
+#, python-format
+msgid "Creating Consumer connection for Service %s"
+msgstr ""
+
+#: nova/service.py:190
+#, python-format
+msgid "Join ServiceGroup membership for this service %s"
+msgstr ""
+
+#: nova/service.py:270
+msgid "Service killed that has no database entry"
+msgstr ""
+
+#: nova/service.py:292
+#, python-format
+msgid "Temporary directory is invalid: %s"
+msgstr ""
+
+#: nova/service.py:394
+msgid "serve() can only be called once"
+msgstr ""
+
+#: nova/utils.py:145
+#, python-format
+msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
+msgstr ""
+
+#: nova/utils.py:173
+#, python-format
+msgid "debug in callback: %s"
+msgstr ""
+
+#: nova/utils.py:335
+#, python-format
+msgid "Link Local address is not found.:%s"
+msgstr ""
+
+#: nova/utils.py:338
+#, python-format
+msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgstr ""
+
+#: nova/utils.py:377
+#, python-format
+msgid "Invalid backend: %s"
+msgstr ""
+
+#: nova/utils.py:438
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
+#: nova/utils.py:567
+#, python-format
+msgid "Expected object of type: %s"
+msgstr ""
+
+#: nova/utils.py:596
+#, python-format
+msgid "Invalid server_string: %s"
+msgstr ""
+
+#: nova/utils.py:733
+#, python-format
+msgid "timefunc: '%(name)s' took %(total_time).2f secs"
+msgstr ""
+
+#: nova/utils.py:799
+#, python-format
+msgid "Reloading cached file %s"
+msgstr ""
+
+#: nova/utils.py:931 nova/virt/configdrive.py:177
+#, python-format
+msgid "Could not remove tmpdir: %s"
+msgstr ""
+
+#: nova/utils.py:1083
+#, python-format
+msgid "%s is not a string or unicode"
+msgstr ""
+
+#: nova/utils.py:1087
+#, python-format
+msgid "%(name)s has less than %(min_length)s characters."
+msgstr ""
+
+#: nova/utils.py:1092
+#, python-format
+msgid "%(name)s has more than %(max_length)s characters."
+msgstr ""
+
+#: nova/wsgi.py:122
+#, python-format
+msgid "%(name)s listening on %(host)s:%(port)s"
+msgstr ""
+
+#: nova/wsgi.py:137
+#, python-format
+msgid "Unable to find cert_file : %s"
+msgstr ""
+
+#: nova/wsgi.py:141
+#, python-format
+msgid "Unable to find ca_file : %s"
+msgstr ""
+
+#: nova/wsgi.py:145
+#, python-format
+msgid "Unable to find key_file : %s"
+msgstr ""
+
+#: nova/wsgi.py:149
+msgid ""
+"When running server in SSL mode, you must specify both a cert_file and "
+"key_file option value in your configuration file"
+msgstr ""
+
+#: nova/wsgi.py:180
+#, python-format
+msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
+msgstr ""
+
+#: nova/wsgi.py:207
+msgid "Stopping WSGI server."
+msgstr ""
+
+#: nova/wsgi.py:225
+msgid "WSGI server has stopped."
+msgstr ""
+
+#: nova/wsgi.py:294
+msgid "You must implement __call__"
+msgstr ""
+
+#: nova/wsgi.py:480
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
+#: nova/api/auth.py:116
+msgid "Invalid service catalog json."
+msgstr ""
+
+#: nova/api/auth.py:139
+msgid "Sourcing roles from deprecated X-Role HTTP header"
+msgstr ""
+
+#: nova/api/sizelimit.py:53 nova/api/sizelimit.py:62 nova/api/sizelimit.py:76
+#: nova/api/metadata/password.py:62
+msgid "Request is too large."
+msgstr ""
+
+#: nova/api/validator.py:131
+#, python-format
+msgid "%(key)s with value %(value)s failed validator %(name)s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:81
+#, python-format
+msgid "%(code)s: %(message)s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:104
+#, python-format
+msgid "FaultWrapper: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:174
+msgid "Too many failed authentications."
+msgstr ""
+
+#: nova/api/ec2/__init__.py:183
+#, python-format
+msgid ""
+"Access key %(access_key)s has had %(failures)d failed authentications and"
+" will be locked out for %(lock_mins)d minutes."
+msgstr ""
+
+#: nova/api/ec2/__init__.py:202
+msgid "Signature not provided"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:206
+msgid "Access key not provided"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+msgid "Failure communicating with keystone"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:255
+#, python-format
+msgid "Keystone failure: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:315
+msgid "Timestamp failed validation."
+msgstr ""
+
+#: nova/api/ec2/__init__.py:335
+#, python-format
+msgid "action: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:337
+#, python-format
+msgid "arg: %(key)s\t\tval: %(value)s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:413
+#, python-format
+msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:487
+#, python-format
+msgid "InstanceNotFound raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:493
+#, python-format
+msgid "VolumeNotFound raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:499
+#, python-format
+msgid "SnapshotNotFound raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:505
+#, python-format
+msgid "NotFound raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:514
+#, python-format
+msgid "KeyPairExists raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:519
+#, python-format
+msgid "InvalidKeypair raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:524
+#, python-format
+msgid "InvalidParameterValue raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:528
+#, python-format
+msgid "InvalidPortRange raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:532
+#, python-format
+msgid "NotAuthorized raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:536
+#, python-format
+msgid "InvalidRequest raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:540
+#, python-format
+msgid "QuotaError raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:544
+#, python-format
+msgid "Invalid id: bogus (expecting \"i-...\"): %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:553
+#, python-format
+msgid "Unexpected error raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:554
+#, python-format
+msgid "Environment: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
+msgid "An unknown error has occurred. Please try your request again."
+msgstr ""
+
+#: nova/api/ec2/apirequest.py:61
+#, python-format
+msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:391
+#, python-format
+msgid "Create snapshot of volume %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:416
+#, python-format
+msgid "Could not find key pair(s): %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:433
+#, python-format
+msgid "Create key pair %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/openstack/compute/contrib/keypairs.py:93
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:449
+#, python-format
+msgid "Import key %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:469
+#, python-format
+msgid "Delete key pair %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:616
+#, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:623
+#, python-format
+msgid "Invalid IP protocol %s."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+msgid "No rule for the specified parameters."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:676
+#, python-format
+msgid "%s - This rule already exists in group"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:759
+#, python-format
+msgid "Get console output for instance %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:832
+#, python-format
+msgid "Create volume from snapshot %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#, python-format
+msgid "Create volume of %s GB"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:863
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:876
+#, python-format
+msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:887
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#, python-format
+msgid "Detach volume %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:916
+msgid "Detach Volume Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
+#, python-format
+msgid "attribute not supported: %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1073
+#, python-format
+msgid "vol = %s\n"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1233
+msgid "Allocate address"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1237
+msgid "No more floating IPs available"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1241
+#, python-format
+msgid "Release address %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1246
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1249
+#, python-format
+msgid "Associate address %(public_ip)s to instance %(instance_id)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1259
+msgid "Unable to associate IP Address, no fixed_ips."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1267
+#: nova/api/openstack/compute/contrib/floating_ips.py:248
+#, python-format
+msgid "multiple fixed_ips exist, using the first: %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1276
+msgid "Floating ip is already associated."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1279
+msgid "l3driver call to add floating ip failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1282
+msgid "Error, unable to associate floating ip."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1290
+#, python-format
+msgid "Disassociate address %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1295
+msgid "Floating ip is not associated."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1298
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1325
+msgid "Image must be available"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1357
+msgid "Going to start terminating instances"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1367
+#, python-format
+msgid "Reboot instance %r"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1376
+msgid "Going to stop instances"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1385
+msgid "Going to start instances"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1476
+#, python-format
+msgid "De-registering image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1492
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1511
+#, python-format
+msgid "Registered image %(image_location)s with id %(image_id)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1574
+msgid "user or group not specified"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1576
+msgid "only group \"all\" is supported"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1578
+msgid "operation_type must be add or remove"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1580
+#, python-format
+msgid "Updating image %s publicity"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1593
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1621
+#, python-format
+msgid ""
+"Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
+"have a volume attached at root (%(root)s)"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1652
+#, python-format
+msgid "Couldn't stop instance with in %d sec"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1670
+#, python-format
+msgid "image of %(instance)s at %(now)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+msgid "resource_id and tag are required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
+msgid "Expecting a list of resources"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+msgid "Only instances implemented"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
+msgid "Expecting a list of tagSets"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1761
+msgid "Expecting key to be set"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1834
+msgid "Invalid CIDR"
+msgstr ""
+
+#: nova/api/ec2/ec2utils.py:249
+msgid "Request must include either Timestamp or Expires, but cannot contain both"
+msgstr ""
+
+#: nova/api/ec2/ec2utils.py:267
+msgid "Timestamp is invalid."
+msgstr ""
+
+#: nova/api/metadata/handler.py:108
+msgid ""
+"X-Instance-ID present in request headers. The "
+"'service_quantum_metadata_proxy' option must be enabled to process this "
+"header."
+msgstr ""
+
+#: nova/api/metadata/handler.py:134 nova/api/metadata/handler.py:141
+#, python-format
+msgid "Failed to get metadata for ip: %s"
+msgstr ""
+
+#: nova/api/metadata/handler.py:153
+msgid "X-Instance-ID header is missing from request."
+msgstr ""
+
+#: nova/api/metadata/handler.py:155
+msgid "Multiple X-Instance-ID headers found within request."
+msgstr ""
+
+#: nova/api/metadata/handler.py:169
+#, python-format
+msgid ""
+"X-Instance-ID-Signature: %(signature)s does not match the expected value:"
+" %(expected_signature)s for id: %(instance_id)s.  Request From: "
+"%(remote_address)s"
+msgstr ""
+
+#: nova/api/metadata/handler.py:178
+msgid "Invalid proxy request signature."
+msgstr ""
+
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
+#, python-format
+msgid "Failed to get metadata for instance id: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:53
+#, python-format
+msgid "Caught error: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:62
+#, python-format
+msgid "%(url)s returned with HTTP %(status)d"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:137
+msgid "Must specify an ExtensionManager class"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
+#, python-format
+msgid "Extended resource: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
+#, python-format
+msgid ""
+"Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
+"resource"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
+#, python-format
+msgid "Extension %(ext_name)s extending resource: %(collection)s"
+msgstr ""
+
+#: nova/api/openstack/common.py:114
+#, python-format
+msgid ""
+"status is UNKNOWN from vm_state=%(vm_state)s task_state=%(task_state)s. "
+"Bad upgrade or db corrupted?"
+msgstr ""
+
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
+msgid "limit param must be an integer"
+msgstr ""
+
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
+msgid "limit param must be positive"
+msgstr ""
+
+#: nova/api/openstack/common.py:182
+msgid "offset param must be an integer"
+msgstr ""
+
+#: nova/api/openstack/common.py:196
+msgid "offset param must be positive"
+msgstr ""
+
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
+#, python-format
+msgid "marker [%s] not found"
+msgstr ""
+
+#: nova/api/openstack/common.py:271
+#, python-format
+msgid "href %s does not contain version"
+msgstr ""
+
+#: nova/api/openstack/common.py:286
+msgid "Image metadata limit exceeded"
+msgstr ""
+
+#: nova/api/openstack/common.py:294
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:297
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:300
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:362
+#, python-format
+msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
+msgstr ""
+
+#: nova/api/openstack/common.py:366
+#, python-format
+msgid "Instance is in an invalid state for '%s'"
+msgstr ""
+
+#: nova/api/openstack/common.py:446
+msgid "Rejecting snapshot request, snapshots currently disabled"
+msgstr ""
+
+#: nova/api/openstack/common.py:448
+msgid "Instance snapshots are not permitted at this time."
+msgstr ""
+
+#: nova/api/openstack/extensions.py:196
+#, python-format
+msgid "Loaded extension: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:235
+#, python-format
+msgid "Ext name: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:236
+#, python-format
+msgid "Ext alias: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:237
+#, python-format
+msgid "Ext description: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:239
+#, python-format
+msgid "Ext namespace: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:240
+#, python-format
+msgid "Ext updated: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:242
+#, python-format
+msgid "Exception loading extension: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:256
+#, python-format
+msgid "Loading extension %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:265
+#, python-format
+msgid "Calling extension factory %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:277
+#, python-format
+msgid "Failed to load extension %(ext_factory)s: %(exc)s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:347
+#, python-format
+msgid "Failed to load extension %(classpath)s: %(exc)s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:370
+#, python-format
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
+msgid "cannot understand JSON"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:631
+msgid "too many body keys"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:675
+#, python-format
+msgid "Exception handling resource: %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:679
+#, python-format
+msgid "Fault thrown: %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:682
+#, python-format
+msgid "HTTP exception thrown: %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:796
+msgid "Unrecognized Content-Type provided in request"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:800
+msgid "No Content-Type provided in request"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:804
+msgid "Empty body provided in request"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:912
+#, python-format
+msgid "There is no such action: %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
+#: nova/api/openstack/compute/server_metadata.py:58
+#: nova/api/openstack/compute/server_metadata.py:76
+#: nova/api/openstack/compute/server_metadata.py:101
+#: nova/api/openstack/compute/server_metadata.py:126
+#: nova/api/openstack/compute/contrib/admin_actions.py:211
+#: nova/api/openstack/compute/contrib/evacuate.py:47
+msgid "Malformed request body"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:919
+#, python-format
+msgid "Action: '%(action)s', body: %(body)s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:922
+#, python-format
+msgid "Calling method %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:931
+msgid "Unsupported Content-Type"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:943
+msgid "Malformed request url"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:1174
+#, python-format
+msgid "Returning %(code)s to user: %(explanation)s"
+msgstr ""
+
+#: nova/api/openstack/xmlutil.py:270
+msgid "element is not a child"
+msgstr ""
+
+#: nova/api/openstack/xmlutil.py:419
+msgid "root element selecting a list"
+msgstr ""
+
+#: nova/api/openstack/xmlutil.py:742
+#, python-format
+msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
+msgstr ""
+
+#: nova/api/openstack/xmlutil.py:862
+msgid "subclasses must implement construct()!"
+msgstr ""
+
+#: nova/api/openstack/compute/extensions.py:39
+msgid "Initializing extension manager."
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:107
+#, python-format
+msgid "Invalid is_public filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:127
+#, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:134
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:36
+#: nova/api/openstack/compute/images.py:141
+#: nova/api/openstack/compute/images.py:157
+msgid "Image not found."
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:76
+msgid "Incorrect request body format"
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:80
+#: nova/api/openstack/compute/server_metadata.py:80
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:85
+msgid "Request body and URI mismatch"
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/server_metadata.py:84
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:88
+msgid "Request body contains too many items"
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:109
+msgid "Invalid metadata key"
+msgstr ""
+
+#: nova/api/openstack/compute/images.py:162
+msgid "You are not allowed to delete the image."
+msgstr ""
+
+#: nova/api/openstack/compute/ips.py:68
+msgid "Instance does not exist"
+msgstr ""
+
+#: nova/api/openstack/compute/ips.py:91
+msgid "Instance is not a member of specified network"
+msgstr ""
+
+#: nova/api/openstack/compute/limits.py:161
+#, python-format
+msgid ""
+"Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
+"%(unit_string)s."
+msgstr ""
+
+#: nova/api/openstack/compute/limits.py:288
+msgid "This request was rate-limited."
+msgstr ""
+
+#: nova/api/openstack/compute/server_metadata.py:38
+#: nova/api/openstack/compute/server_metadata.py:122
+#: nova/api/openstack/compute/server_metadata.py:173
+msgid "Server does not exist"
+msgstr ""
+
+#: nova/api/openstack/compute/server_metadata.py:154
+#: nova/api/openstack/compute/server_metadata.py:165
+msgid "Metadata item was not found"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:521
+#: nova/api/openstack/compute/contrib/cells.py:272
+msgid "Invalid changes-since value"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:540
+msgid "Only administrators may list deleted instances"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:559
+#, python-format
+msgid "Flavor '%s' could not be found "
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
+msgid "Instance could not be found"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:595
+msgid "Device name cannot include spaces."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:612
+#, python-format
+msgid "Bad personality format: missing %s"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:615
+msgid "Bad personality format"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:618
+#, python-format
+msgid "Personality content for %s cannot be decoded"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:649
+msgid "Unknown argment : port"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:652
+#, python-format
+msgid "Bad port format: port uuid is not in proper format (%s)"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:662
+#, python-format
+msgid "Bad networks format: network uuid is not in proper format (%s)"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:672
+#, python-format
+msgid "Invalid fixed IP address (%s)"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:685
+#, python-format
+msgid "Duplicate networks (%s) are not allowed"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:691
+#, python-format
+msgid "Bad network format: missing %s"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:694
+msgid "Bad networks format"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:720
+msgid "Userdata content cannot be decoded"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:725
+msgid "accessIPv4 is not proper IPv4 format"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:730
+msgid "accessIPv6 is not proper IPv6 format"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:759
+msgid "Server name is not defined"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
+msgid "Invalid flavorRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:849
+msgid "min_count must be an integer value"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:852
+msgid "min_count must be > 0"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:858
+msgid "max_count must be an integer value"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:861
+msgid "max_count must be > 0"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:865
+msgid "min_count must be <= max_count"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:919
+msgid "Can not find requested image"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:927
+msgid "Invalid key_name provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1001
+msgid "HostId cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1005
+msgid "Personality cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
+msgid "Instance has not been resized."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1051
+msgid "Flavor used by the instance could not be found."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1067
+msgid "Argument 'type' for reboot is not HARD or SOFT"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1071
+msgid "Missing argument 'type' for reboot"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1093
+msgid "Unable to locate requested flavor."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1096
+msgid "Resize requires a flavor change."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1120
+msgid "Missing imageRef attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1129
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1156
+msgid "Missing flavorRef attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1169
+msgid "No adminPass was specified"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1173
+#: nova/api/openstack/compute/servers.py:1382
+msgid "Invalid adminPass"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1179
+msgid "Unable to set password on instance"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1188
+msgid "Unable to parse metadata key/value pairs."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1201
+msgid "Resize request has invalid 'flavorRef' attribute."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1204
+msgid "Resize requests require 'flavorRef' attribute."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1222
+#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/keypairs.py:78
+msgid "Invalid request body"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1228
+msgid "Could not parse imageRef from request."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1289
+msgid "Cannot find image for rebuild"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1323
+msgid "createImage entity requires name attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1408
+#, python-format
+msgid "Removing options '%s' from query"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:60
+#, python-format
+msgid "Compute.api::pause %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:77
+#, python-format
+msgid "Compute.api::unpause %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:94
+#, python-format
+msgid "compute.api::suspend %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:111
+#, python-format
+msgid "compute.api::resume %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:127
+#, python-format
+msgid "Error in migrate %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:141
+#, python-format
+msgid "Compute.api::reset_network %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:154
+#: nova/api/openstack/compute/contrib/admin_actions.py:170
+#: nova/api/openstack/compute/contrib/admin_actions.py:186
+#: nova/api/openstack/compute/contrib/admin_actions.py:321
+#: nova/api/openstack/compute/contrib/multinic.py:41
+#: nova/api/openstack/compute/contrib/rescue.py:42
+msgid "Server not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:157
+#, python-format
+msgid "Compute.api::inject_network_info %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:173
+#, python-format
+msgid "Compute.api::lock %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:189
+#, python-format
+msgid "Compute.api::unlock %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:219
+#, python-format
+msgid "createBackup entity requires %s attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:223
+msgid "Malformed createBackup entity"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:229
+msgid "createBackup attribute 'rotation' must be an integer"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:232
+msgid "createBackup attribute 'rotation' must be greater than or equal to zero"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:248
+#: nova/api/openstack/compute/contrib/console_output.py:45
+#: nova/api/openstack/compute/contrib/server_diagnostics.py:47
+#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+msgid "Instance not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:278
+msgid "host and block_migration must be specified."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:292
+#, python-format
+msgid "Live migration of instance %s to another host failed"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:295
+#, python-format
+msgid "Live migration of instance %(id)s to host %(host)s failed"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:313
+#, python-format
+msgid "Desired state must be specified.  Valid states are: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:324
+#, python-format
+msgid "Compute.api::resetState %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:89
+#, python-format
+msgid "Cannot show aggregate: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:115
+#, python-format
+msgid "Cannot update aggregate: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:127
+#, python-format
+msgid "Cannot delete aggregate: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:140
+#, python-format
+msgid "Aggregates does not have %s action"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:153
+#: nova/api/openstack/compute/contrib/aggregates.py:158
+#, python-format
+msgid "Cannot add host %(host)s in aggregate %(id)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:172
+#: nova/api/openstack/compute/contrib/aggregates.py:176
+#, python-format
+msgid "Cannot remove host %(host)s in aggregate %(id)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:196
+#, python-format
+msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:102
+msgid "Attach interface"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:109
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:142
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:165
+msgid "Network driver does not support this function."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:113
+msgid "Failed to attach interface"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:121
+msgid "Attachments update is not supported"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:132
+#, python-format
+msgid "Detach interface %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
+msgid "Must specify id or address"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:193
+msgid "Cell name cannot be empty"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:197
+msgid "Cell name cannot contain '!' or '.'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:204
+msgid "Cell type must be 'parent' or 'child'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:224
+#: nova/api/openstack/compute/contrib/cells.py:244
+msgid "No cell information in request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:229
+msgid "No cell name in request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:266
+msgid "Only 'updated_since' and 'project_id' are understood."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/certificates.py:71
+msgid "Only root certificate can be retrieved."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cloudpipe.py:149
+msgid ""
+"Unable to claim IP for VPN instances, ensure it isn't running, and try "
+"again in a few minutes"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cloudpipe_update.py:41
+#, python-format
+msgid "Unknown action %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/console_output.py:50
+msgid "os-getConsoleOutput malformed or missing from request body"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/console_output.py:57
+msgid "Length in request body must be an integer value"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/console_output.py:65
+msgid "Unable to get console"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/consoles.py:51
+msgid "Instance not yet ready"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:97
+#, python-format
+msgid "Can't connect to service: %s, no portspecified\n"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:116
+msgid "Coverage begin"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+msgid "Coverage not running"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+msgid "Invalid path"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+msgid "No path given for report file"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+msgid "You can't use html reports without combining"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#, python-format
+msgid "Directory conflict: %s already exists"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+msgid "Python coverage module is not installed."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#, python-format
+msgid "Coverage doesn't have %s action"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/disk_config.py:43
+#, python-format
+msgid "%s must be either 'MANUAL' or 'AUTO'."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/evacuate.py:59
+msgid "admin password can't be changed on existing disk"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/evacuate.py:67
+msgid "host and onSharedStorage must be specified."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/evacuate.py:78
+#, python-format
+msgid "Error in evacuate, %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/fixed_ips.py:39
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:41
+#, python-format
+msgid "Fixed IP %s has been deleted"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/fixed_ips.py:71
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:75
+#, python-format
+msgid "Fixed IP %s not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/flavor_access.py:76
+#: nova/api/openstack/compute/contrib/flavor_access.py:100
+msgid "Flavor not found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/flavor_access.py:105
+msgid "Access list not available for public flavors."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/flavor_access.py:117
+msgid "No request body"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:55
+msgid "No Request Body"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ip_dns.py:223
+msgid "DNS entries not found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:129
+#: nova/api/openstack/compute/contrib/floating_ips.py:177
+#, python-format
+msgid "Floating ip not found for id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:162
+#, python-format
+msgid "No more floating ips in pool %s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:164
+msgid "No more floating ips available."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:189
+#, python-format
+msgid "Floating ip %s has been disassociated"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:216
+#: nova/api/openstack/compute/contrib/floating_ips.py:281
+#: nova/api/openstack/compute/contrib/security_groups.py:413
+msgid "Missing parameter dict"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:219
+#: nova/api/openstack/compute/contrib/floating_ips.py:284
+msgid "Address not specified"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:226
+msgid "No nw_info cache associated with instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:231
+msgid "No fixed ips associated to instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:242
+msgid "Specified fixed address not assigned to instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:256
+msgid "floating ip is already associated"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:259
+msgid "l3driver call to add floating ip failed"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:263
+#: nova/api/openstack/compute/contrib/floating_ips.py:292
+msgid "floating ip not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:266
+msgid "Error. Unable to associate floating ip"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:307
+msgid "Floating ip is not associated"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:311
+#, python-format
+msgid "Floating ip %(address)s is not associated with instance %(id)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
+#: nova/cmd/manage.py:377
+#, python-format
+msgid "/%s should be specified as single address(es) not in cidr format"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/fping.py:53
+msgid "fping utility is not found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:183
+#, python-format
+msgid "Invalid update setting: '%s'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:186
+#, python-format
+msgid "Invalid status: '%s'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:188
+#, python-format
+msgid "Invalid mode: '%s'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:190
+msgid "'status' or 'maintenance_mode' needed for host update"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:205
+#, python-format
+msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:211
+msgid "Virt driver does not implement host maintenance mode."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:224
+#, python-format
+msgid "Enabling host %s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:226
+#, python-format
+msgid "Disabling host %s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:231
+msgid "Virt driver does not implement host disabled status."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:247
+msgid "Virt driver does not implement host power management."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:333
+msgid "Describe-resource is admin only functionality"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hypervisors.py:183
+#: nova/api/openstack/compute/contrib/hypervisors.py:194
+#, python-format
+msgid "Hypervisor with ID '%s' could not be found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hypervisors.py:202
+msgid "Virt driver does not implement uptime function."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hypervisors.py:218
+#: nova/api/openstack/compute/contrib/hypervisors.py:228
+#, python-format
+msgid "No hypervisor matching '%s' could be found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/instance_usage_audit_log.py:57
+#, python-format
+msgid "Invalid timestamp for date %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/keypairs.py:101
+#, python-format
+msgid "Key pair '%s' already exists."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/multinic.py:52
+msgid "Missing 'networkId' argument for addFixedIp"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/multinic.py:68
+msgid "Missing 'address' argument for removeFixedIp"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/multinic.py:77
+#, python-format
+msgid "Unable to find address %r"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/networks_associate.py:23
+#, python-format
+msgid "Disassociating host with network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/networks_associate.py:27
+#: nova/api/openstack/compute/contrib/networks_associate.py:38
+#: nova/api/openstack/compute/contrib/networks_associate.py:50
+#: nova/api/openstack/compute/contrib/os_networks.py:79
+#: nova/api/openstack/compute/contrib/os_networks.py:89
+#: nova/api/openstack/compute/contrib/os_networks.py:99
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:110
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:132
+msgid "Network not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/networks_associate.py:34
+#, python-format
+msgid "Disassociating project with network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:74
+#, python-format
+msgid "Disassociating network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:85
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:106
+#, python-format
+msgid "Showing network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:95
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:124
+#, python-format
+msgid "Deleting network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:110
+msgid "Missing network in body"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:114
+msgid "Network label is required"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:118
+msgid "Network cidr or cidr_v6 is required"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:120
+#, python-format
+msgid "Creating network with label %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:136
+#, python-format
+msgid "Associating network %(network)s with project %(project)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:144
+msgid "VLAN support must be enabled"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:147
+#, python-format
+msgid "Cannot associate network %(network)s with project %(project)s: %(message)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:121
+msgid "Failed to update usages deallocating network."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:151
+msgid "No CIDR requested"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:157
+msgid "Requested network does not contain enough (2+) usable hosts"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:161
+msgid "CIDR is malformed."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:164
+msgid "Address could not be converted."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:172
+msgid "Quota exceeded, too many networks."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:183
+msgid "Create networks failed"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:65
+msgid "Quota limit must be -1 or greater."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:100
+#, python-format
+msgid "Bad key(s) %s in quota_set"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:107
+#, python-format
+msgid "Quota for %s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/scheduler_hints.py:38
+msgid "Malformed scheduler_hints attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
+#: nova/api/openstack/compute/contrib/security_groups.py:324
+msgid "Not enough parameters to build a valid rule."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_group_default_rules.py:133
+msgid "This default rule already exists."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_group_default_rules.py:154
+#, python-format
+msgid "Showing security_group_default_rule with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_group_default_rules.py:158
+msgid "security group default rule not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_groups.py:332
+#, python-format
+msgid "Bad prefix for network in cidr %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_groups.py:416
+msgid "Security group not specified"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_groups.py:420
+msgid "Security group name cannot be empty"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+msgid "start instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+msgid "stop instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:123
+msgid "Unknown action"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:137
+msgid "Unknown service"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+msgid "Invalid start time. The start time cannot occur after the end time."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:75
+#, python-format
+msgid "vol=%s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:187
+#, python-format
+msgid "Delete volume with id: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
+#, python-format
+msgid "Instance %s is not attached."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:380
+#, python-format
+msgid "Bad volumeId format: volumeId is not in proper format (%s)"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:399
+#, python-format
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:579
+#, python-format
+msgid "Delete snapshot with id: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:619
+#, python-format
+msgid "Create snapshot from volume %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:626
+#, python-format
+msgid "Invalid value '%s' for force."
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:60
+#, python-format
+msgid "Reserving IP address %s"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:63
+#, python-format
+msgid "Unreserving IP address %s"
+msgstr ""
+
+#: nova/api/openstack/compute/views/servers.py:186
+msgid "Instance has had its instance_type removed from the DB"
+msgstr ""
+
+#: nova/cells/messaging.py:204
+#, python-format
+msgid "Error processing message locally: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#, python-format
+msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
+msgstr ""
+
+#: nova/cells/messaging.py:380
+#, python-format
+msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
+msgstr ""
+
+#: nova/cells/messaging.py:404
+#, python-format
+msgid "Error locating next hop for message: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:431
+#, python-format
+msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:510
+#, python-format
+msgid "Error locating next hops for message: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:530
+#, python-format
+msgid "Error sending message to next hops: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:548
+#, python-format
+msgid "Error waiting for responses from neighbor cells: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:659
+#, python-format
+msgid "Unknown method '%(method)s' in compute API"
+msgstr ""
+
+#: nova/cells/messaging.py:682
+#, python-format
+msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
+msgstr ""
+
+#: nova/cells/messaging.py:692
+#, python-format
+msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
+msgstr ""
+
+#: nova/cells/messaging.py:819
+#, python-format
+msgid "Got update for instance: %(instance)s"
+msgstr ""
+
+#: nova/cells/messaging.py:862
+msgid "Got update to delete instance"
+msgstr ""
+
+#: nova/cells/messaging.py:877
+#, python-format
+msgid "Got broadcast to %(delete_type)s delete instance"
+msgstr ""
+
+#: nova/cells/messaging.py:891
+#, python-format
+msgid "Got message to create instance fault: %(instance_fault)s"
+msgstr ""
+
+#: nova/cells/messaging.py:912
+#, python-format
+msgid ""
+"Forcing a sync of instances, project_id=%(projid_str)s, "
+"updated_since=%(since_str)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1097
+#, python-format
+msgid "Updating parents with our capabilities: %(capabs)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1117
+#, python-format
+msgid "Updating parents with our capacities: %(capacities)s"
+msgstr ""
+
+#: nova/cells/scheduler.py:106
+#, python-format
+msgid "Scheduling with routing_path=%(routing_path)s"
+msgstr ""
+
+#: nova/cells/scheduler.py:132
+#, python-format
+msgid ""
+"No cells available when scheduling.  Will retry in %(sleep_time)s "
+"second(s)"
+msgstr ""
+
+#: nova/cells/scheduler.py:140
+#, python-format
+msgid "Error scheduling instances %(instance_uuids)s"
+msgstr ""
+
+#: nova/cells/state.py:270
+msgid "Updating cell cache from db."
+msgstr ""
+
+#: nova/cells/state.py:315
+#, python-format
+msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
+msgstr ""
+
+#: nova/cells/state.py:331
+#, python-format
+msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:48
+msgid "Instance type for vpn instances"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:51
+msgid "Template for cloudpipe instance boot script"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:54
+msgid "Network to push into openvpn config"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:57
+msgid "Netmask to push into openvpn config"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:126
+#, python-format
+msgid "Launching VPN for %s"
+msgstr ""
+
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
+#, python-format
+msgid "Failed to load %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:236
+#, python-format
+msgid "start deployment for node %(node_id)s, params %(params)s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:244
+#, python-format
+msgid "deployment to node %s failed"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:248
+#, python-format
+msgid "deployment to node %s done"
+msgstr ""
+
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#, python-format
+msgid "Could not read %s. Re-running with sudo"
+msgstr ""
+
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+msgid "sudo failed, continuing as if nothing happened"
+msgstr ""
+
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+msgid "Please re-run nova-manage as root."
+msgstr ""
+
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+msgid "Command failed, please check log for more info"
+msgstr ""
+
+#: nova/cmd/dhcpbridge.py:46
+msgid "leasing ip"
+msgstr ""
+
+#: nova/cmd/dhcpbridge.py:66
+msgid "releasing ip"
+msgstr ""
+
+#: nova/cmd/dhcpbridge.py:121
+#, python-format
+msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
+msgstr ""
+
+#: nova/cmd/dhcpbridge.py:131
+msgid "Environment variable 'NETWORK_ID' must be set."
+msgstr ""
+
+#: nova/cmd/manage.py:202
+msgid ""
+"The above error may show that the database has not been created.\n"
+"Please create a database using 'nova-manage db sync' before running this "
+"command."
+msgstr ""
+
+#: nova/cmd/manage.py:237
+#, python-format
+msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
+msgstr ""
+
+#: nova/cmd/manage.py:243
+msgid "Quota"
+msgstr ""
+
+#: nova/cmd/manage.py:244
+msgid "Limit"
+msgstr ""
+
+#: nova/cmd/manage.py:245
+msgid "In Use"
+msgstr ""
+
+#: nova/cmd/manage.py:246
+msgid "Reserved"
+msgstr ""
+
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
+#, python-format
+msgid "error: %s"
+msgstr ""
+
+#: nova/cmd/manage.py:294
+msgid "network"
+msgstr ""
+
+#: nova/cmd/manage.py:295
+msgid "IP address"
+msgstr ""
+
+#: nova/cmd/manage.py:296
+msgid "hostname"
+msgstr ""
+
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+msgid "host"
+msgstr ""
+
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+msgid "No fixed IP found."
+msgstr ""
+
+#: nova/cmd/manage.py:325
+#, python-format
+msgid "WARNING: fixed ip %s allocated to missing instance"
+msgstr ""
+
+#: nova/cmd/manage.py:384
+#, python-format
+msgid ""
+"Too many IP addresses will be generated.  Please increase /%s to reduce "
+"the number generated."
+msgstr ""
+
+#: nova/cmd/manage.py:433
+msgid "No floating IP addresses have been defined."
+msgstr ""
+
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+msgid "id"
+msgstr ""
+
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+msgid "IPv4"
+msgstr ""
+
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+msgid "IPv6"
+msgstr ""
+
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+msgid "start address"
+msgstr ""
+
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+msgid "DNS1"
+msgstr ""
+
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+msgid "DNS2"
+msgstr ""
+
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+msgid "VlanID"
+msgstr ""
+
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/tests/test_nova_manage.py:219
+msgid "project"
+msgstr ""
+
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+msgid "uuid"
+msgstr ""
+
+#: nova/cmd/manage.py:510
+msgid "No networks found"
+msgstr ""
+
+#: nova/cmd/manage.py:529
+msgid "Please specify either fixed_range or uuid"
+msgstr ""
+
+#: nova/cmd/manage.py:534
+msgid "UUID is required to delete Quantum Networks"
+msgstr ""
+
+#: nova/cmd/manage.py:537
+msgid "Deleting by fixed_range is not supported with the QuantumManager"
+msgstr ""
+
+#: nova/cmd/manage.py:600
+msgid "instance"
+msgstr ""
+
+#: nova/cmd/manage.py:601
+msgid "node"
+msgstr ""
+
+#: nova/cmd/manage.py:602
+msgid "type"
+msgstr ""
+
+#: nova/cmd/manage.py:603
+msgid "state"
+msgstr ""
+
+#: nova/cmd/manage.py:604
+msgid "launched"
+msgstr ""
+
+#: nova/cmd/manage.py:605
+msgid "image"
+msgstr ""
+
+#: nova/cmd/manage.py:606
+msgid "kernel"
+msgstr ""
+
+#: nova/cmd/manage.py:607
+msgid "ramdisk"
+msgstr ""
+
+#: nova/cmd/manage.py:609
+msgid "user"
+msgstr ""
+
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+msgid "zone"
+msgstr ""
+
+#: nova/cmd/manage.py:611
+msgid "index"
+msgstr ""
+
+#: nova/cmd/manage.py:656
+msgid "Binary"
+msgstr ""
+
+#: nova/cmd/manage.py:657
+msgid "Host"
+msgstr ""
+
+#: nova/cmd/manage.py:658
+msgid "Zone"
+msgstr ""
+
+#: nova/cmd/manage.py:659
+msgid "Status"
+msgstr ""
+
+#: nova/cmd/manage.py:660
+msgid "State"
+msgstr ""
+
+#: nova/cmd/manage.py:661
+msgid "Updated_At"
+msgstr ""
+
+#: nova/cmd/manage.py:683
+#, python-format
+msgid "Service %(service)s on host %(host)s enabled."
+msgstr ""
+
+#: nova/cmd/manage.py:696
+#, python-format
+msgid "Service %(service)s on host %(host)s disabled."
+msgstr ""
+
+#: nova/cmd/manage.py:763
+msgid "An unexpected error has occurred."
+msgstr ""
+
+#: nova/cmd/manage.py:764
+msgid "[Result]"
+msgstr ""
+
+#: nova/cmd/manage.py:768
+msgid "HOST"
+msgstr ""
+
+#: nova/cmd/manage.py:769
+msgid "PROJECT"
+msgstr ""
+
+#: nova/cmd/manage.py:770
+msgid "cpu"
+msgstr ""
+
+#: nova/cmd/manage.py:771
+msgid "mem(mb)"
+msgstr ""
+
+#: nova/cmd/manage.py:772
+msgid "hdd"
+msgstr ""
+
+#: nova/cmd/manage.py:854
+msgid "Must supply a positive value for max_rows"
+msgstr ""
+
+#: nova/cmd/manage.py:893
+msgid "Must supply valid parameters to create instance_type"
+msgstr ""
+
+#: nova/cmd/manage.py:897
+msgid "Instance Type exists."
+msgstr ""
+
+#: nova/cmd/manage.py:898
+msgid "Please ensure instance_type name and flavorid are unique."
+msgstr ""
+
+#: nova/cmd/manage.py:900
+msgid "Currently defined instance_type names and flavorids:"
+msgstr ""
+
+#: nova/cmd/manage.py:905
+msgid "Unknown error"
+msgstr ""
+
+#: nova/cmd/manage.py:908
+#, python-format
+msgid "%s created"
+msgstr ""
+
+#: nova/cmd/manage.py:916
+msgid "Valid instance type name is required"
+msgstr ""
+
+#: nova/cmd/manage.py:919
+#, python-format
+msgid "DB Error: %s"
+msgstr ""
+
+#: nova/cmd/manage.py:924
+#, python-format
+msgid "%s deleted"
+msgstr ""
+
+#: nova/cmd/manage.py:960
+#, python-format
+msgid "Key %(key)s set to %(value)s on instance type %(name)s"
+msgstr ""
+
+#: nova/cmd/manage.py:982
+#, python-format
+msgid "Key %(key)s on instance type %(name)s unset"
+msgstr ""
+
+#: nova/cmd/manage.py:1026
+#, python-format
+msgid "Hypervisor: %s"
+msgstr ""
+
+#: nova/cmd/manage.py:1067
+#, python-format
+msgid "Line %(linenum)d : %(line)s"
+msgstr ""
+
+#: nova/cmd/manage.py:1069
+msgid "No errors in logfiles!"
+msgstr ""
+
+#: nova/cmd/manage.py:1081
+msgid "Unable to find system log file!"
+msgstr ""
+
+#: nova/cmd/manage.py:1085
+#, python-format
+msgid "Last %s nova syslog entries:-"
+msgstr ""
+
+#: nova/cmd/manage.py:1094
+msgid "No nova entries in syslog!"
+msgstr ""
+
+#: nova/compute/api.py:282
+msgid "Cannot run any more instances of this type."
+msgstr ""
+
+#: nova/compute/api.py:289
+#, python-format
+msgid "Can only run %s more instances of this type."
+msgstr ""
+
+#: nova/compute/api.py:298
+#, python-format
+msgid ""
+"%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
+"instances. %(msg)s"
+msgstr ""
+
+#: nova/compute/api.py:318
+#, python-format
+msgid ""
+"Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
+"properties"
+msgstr ""
+
+#: nova/compute/api.py:328
+msgid "Metadata property key blank"
+msgstr ""
+
+#: nova/compute/api.py:332
+msgid "Metadata property key greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:336
+msgid "Metadata property value greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:469
+msgid "Failed to set instance name using multi_instance_display_name_template."
+msgstr ""
+
+#: nova/compute/api.py:529
+msgid "Cannot attach one or more volumes to multiple instances"
+msgstr ""
+
+#: nova/compute/api.py:634
+#, python-format
+msgid "Going to run %s instances..."
+msgstr ""
+
+#: nova/compute/api.py:750
+#, python-format
+msgid "bdm %s"
+msgstr ""
+
+#: nova/compute/api.py:777
+#, python-format
+msgid "block_device_mapping %s"
+msgstr ""
+
+#: nova/compute/api.py:1048
+msgid "instance termination disabled"
+msgstr ""
+
+#: nova/compute/api.py:1184
+#, python-format
+msgid "instance type %(old_inst_type_id)d not found"
+msgstr ""
+
+#: nova/compute/api.py:1190
+msgid "going to delete a resizing instance"
+msgstr ""
+
+#: nova/compute/api.py:1200
+#, python-format
+msgid "instance's host %s is down, deleting from database"
+msgstr ""
+
+#: nova/compute/api.py:1243
+msgid "Going to try to soft delete instance"
+msgstr ""
+
+#: nova/compute/api.py:1267
+msgid "Going to try to terminate instance"
+msgstr ""
+
+#: nova/compute/api.py:1317
+msgid "Going to try to stop instance"
+msgstr ""
+
+#: nova/compute/api.py:1334
+msgid "Going to try to start instance"
+msgstr ""
+
+#: nova/compute/api.py:1407
+#, python-format
+msgid "Searching by: %s"
+msgstr ""
+
+#: nova/compute/api.py:1644
+#, python-format
+msgid "snapshot for %s"
+msgstr ""
+
+#: nova/compute/api.py:1988
+msgid "flavor_id is None. Assuming migration."
+msgstr ""
+
+#: nova/compute/api.py:1997
+#, python-format
+msgid ""
+"Old instance type %(current_instance_type_name)s,  new instance type "
+"%(new_instance_type_name)s"
+msgstr ""
+
+#: nova/compute/api.py:2043
+#, python-format
+msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
+msgstr ""
+
+#: nova/compute/api.py:2179
+msgid "Cannot rescue a volume-backed instance"
+msgstr ""
+
+#: nova/compute/api.py:2284
+msgid "Locking"
+msgstr ""
+
+#: nova/compute/api.py:2292
+msgid "Unlocking"
+msgstr ""
+
+#: nova/compute/api.py:2364
+msgid "Volume must be attached in order to detach."
+msgstr ""
+
+#: nova/compute/api.py:2477
+#, python-format
+msgid "Going to try to live migrate instance to %s"
+msgstr ""
+
+#: nova/compute/api.py:2496
+msgid "vm evacuation scheduled"
+msgstr ""
+
+#: nova/compute/api.py:2500
+#, python-format
+msgid ""
+"Instance compute service state on %(inst_host)s expected to be down, but "
+"it was up."
+msgstr ""
+
+#: nova/compute/api.py:2747
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:2751
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
+#: nova/compute/api.py:2847
+#, python-format
+msgid "Security group %s is not a string or unicode"
+msgstr ""
+
+#: nova/compute/api.py:2850
+#, python-format
+msgid "Security group %s cannot be empty."
+msgstr ""
+
+#: nova/compute/api.py:2858
+#, python-format
+msgid ""
+"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
+"limited to '%(allowed)'."
+msgstr ""
+
+#: nova/compute/api.py:2864
+#, python-format
+msgid "Security group %s should not be greater than 255 characters."
+msgstr ""
+
+#: nova/compute/api.py:2882
+msgid "Quota exceeded, too many security groups."
+msgstr ""
+
+#: nova/compute/api.py:2885
+#, python-format
+msgid "Create Security Group %s"
+msgstr ""
+
+#: nova/compute/api.py:2892
+#, python-format
+msgid "Security group %s already exists"
+msgstr ""
+
+#: nova/compute/api.py:2956
+#, python-format
+msgid "Unable to delete system group '%s'"
+msgstr ""
+
+#: nova/compute/api.py:2961
+msgid "Security group is still in use"
+msgstr ""
+
+#: nova/compute/api.py:2969
+msgid "Failed to update usages deallocating security group"
+msgstr ""
+
+#: nova/compute/api.py:2972
+#, python-format
+msgid "Delete security group %s"
+msgstr ""
+
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
+#, python-format
+msgid "Rule (%s) not found"
+msgstr ""
+
+#: nova/compute/api.py:3065
+msgid "Quota exceeded, too many security group rules."
+msgstr ""
+
+#: nova/compute/api.py:3068
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr ""
+
+#: nova/compute/api.py:3077
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr ""
+
+#: nova/compute/api.py:3130
+msgid "Security group id should be integer"
+msgstr ""
+
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
+#, python-format
+msgid "Aborting claim: %s"
+msgstr ""
+
+#: nova/compute/claims.py:113
+#, python-format
+msgid ""
+"Attempting claim: memory %(memory_mb)d MB, disk %(disk_gb)d GB, VCPUs "
+"%(vcpus)d"
+msgstr ""
+
+#: nova/compute/claims.py:125
+msgid "Claim successful"
+msgstr ""
+
+#: nova/compute/claims.py:127
+msgid "Claim failed"
+msgstr ""
+
+#: nova/compute/claims.py:132
+msgid "Memory"
+msgstr ""
+
+#: nova/compute/claims.py:141
+msgid "Disk"
+msgstr ""
+
+#: nova/compute/claims.py:150
+msgid "CPU"
+msgstr ""
+
+#: nova/compute/claims.py:162
+#, python-format
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
+msgstr ""
+
+#: nova/compute/claims.py:169
+#, python-format
+msgid "%(type)s limit not specified, defaulting to unlimited"
+msgstr ""
+
+#: nova/compute/claims.py:176
+#, python-format
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
+msgstr ""
+
+#: nova/compute/claims.py:184
+#, python-format
+msgid ""
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
+msgstr ""
+
+#: nova/compute/flavors.py:90
+msgid "names can only contain [a-zA-Z0-9_.- ]"
+msgstr ""
+
+#: nova/compute/flavors.py:99
+#, python-format
+msgid "'%s' argument must be greater than 0"
+msgstr ""
+
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
+msgstr ""
+
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
+msgstr ""
+
+#: nova/compute/flavors.py:130
+msgid "is_public must be a boolean"
+msgstr ""
+
+#: nova/compute/flavors.py:135
+#, python-format
+msgid "DB error: %s"
+msgstr ""
+
+#: nova/compute/flavors.py:145
+#, python-format
+msgid "Instance type %s not found for deletion"
+msgstr ""
+
+#: nova/compute/manager.py:205
+msgid "Possibly task preempted."
+msgstr ""
+
+#: nova/compute/manager.py:363
+#, python-format
+msgid "%(nodename)s is not a valid node managed by this compute host."
+msgstr ""
+
+#: nova/compute/manager.py:392
+msgid "Instance has been destroyed from under us while trying to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:409
+#, python-format
+msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+msgstr ""
+
+#: nova/compute/manager.py:425
+#, python-format
+msgid ""
+"Instance %(driver_instance)s found in the hypervisor, but not in the "
+"database"
+msgstr ""
+
+#: nova/compute/manager.py:446
+#, python-format
+msgid ""
+"Deleting instance as its host (%(instance_host)s) is not equal to our "
+"host (%(our_host)s)."
+msgstr ""
+
+#: nova/compute/manager.py:461
+msgid "Instance has been marked deleted already, removing it from the hypervisor."
+msgstr ""
+
+#: nova/compute/manager.py:482
+msgid ""
+"Hypervisor driver does not support instance shared storage check, "
+"assuming it's not on shared storage"
+msgstr ""
+
+#: nova/compute/manager.py:488
+msgid "Failed to check if instance shared"
+msgstr ""
+
+#: nova/compute/manager.py:531
+msgid "Failed to revert crashed migration"
+msgstr ""
+
+#: nova/compute/manager.py:534
+msgid "Instance found in migrating state during startup. Resetting task_state"
+msgstr ""
+
+#: nova/compute/manager.py:545
+#, python-format
+msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
+msgstr ""
+
+#: nova/compute/manager.py:550
+msgid "Rebooting instance after nova-compute restart."
+msgstr ""
+
+#: nova/compute/manager.py:564
+msgid "Hypervisor driver does not support resume guests"
+msgstr ""
+
+#: nova/compute/manager.py:569
+msgid "Failed to resume instance"
+msgstr ""
+
+#: nova/compute/manager.py:579
+msgid "Hypervisor driver does not support firewall rules"
+msgstr ""
+
+#: nova/compute/manager.py:583
+#, python-format
+msgid "Lifecycle event %(state)d on VM %(uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:599
+#, python-format
+msgid "Unexpected power state %d"
+msgstr ""
+
+#: nova/compute/manager.py:611
+#, python-format
+msgid "Ignoring event %s"
+msgstr ""
+
+#: nova/compute/manager.py:649
+msgid "Checking state"
+msgstr ""
+
+#: nova/compute/manager.py:747
+#, python-format
+msgid "Volume id: %s finished being created but was not set as 'available'"
+msgstr ""
+
+#: nova/compute/manager.py:764
+#, python-format
+msgid "Setting up bdm %s"
+msgstr ""
+
+#: nova/compute/manager.py:864
+msgid "Success"
+msgstr ""
+
+#: nova/compute/manager.py:887
+msgid "Instance disappeared before we could start it"
+msgstr ""
+
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
+#, python-format
+msgid "No node specified, defaulting to %(node)s"
+msgstr ""
+
+#: nova/compute/manager.py:950
+msgid "Failed to dealloc network for deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:956
+msgid "Instance was deleted during spawn."
+msgstr ""
+
+#: nova/compute/manager.py:984
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:1001
+msgid "Clean up resource before rescheduling."
+msgstr ""
+
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
+msgid "Error trying to reschedule"
+msgstr ""
+
+#: nova/compute/manager.py:1039
+msgid "Retry info not present, will not reschedule"
+msgstr ""
+
+#: nova/compute/manager.py:1044
+msgid "No request spec, will not reschedule"
+msgstr ""
+
+#: nova/compute/manager.py:1050
+#, python-format
+msgid "Re-scheduling %(method)s: attempt %(num)d"
+msgstr ""
+
+#: nova/compute/manager.py:1079
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:1127
+#, python-format
+msgid ""
+"image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
+"allowed_size_bytes=%(allowed_size_bytes)d"
+msgstr ""
+
+#: nova/compute/manager.py:1133
+#, python-format
+msgid ""
+"Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
+"size %(allowed_size_bytes)d"
+msgstr ""
+
+#: nova/compute/manager.py:1143
+msgid "Starting instance..."
+msgstr ""
+
+#: nova/compute/manager.py:1169
+msgid "Instance failed network setup"
+msgstr ""
+
+#: nova/compute/manager.py:1172
+#, python-format
+msgid "Instance network_info: |%s|"
+msgstr ""
+
+#: nova/compute/manager.py:1183
+msgid "Instance failed block device setup"
+msgstr ""
+
+#: nova/compute/manager.py:1202
+msgid "Instance failed to spawn"
+msgstr ""
+
+#: nova/compute/manager.py:1253
+msgid "Deallocating network for instance"
+msgstr ""
+
+#: nova/compute/manager.py:1324
+#, python-format
+msgid "%(action_str)s instance"
+msgstr ""
+
+#: nova/compute/manager.py:1340
+msgid "Failed to deallocate network for instance."
+msgstr ""
+
+#: nova/compute/manager.py:1360
+#, python-format
+msgid "Ignoring DiskNotFound: %s"
+msgstr ""
+
+#: nova/compute/manager.py:1363
+#, python-format
+msgid "Ignoring VolumeNotFound: %s"
+msgstr ""
+
+#: nova/compute/manager.py:1370
+#, python-format
+msgid "terminating bdm %s"
+msgstr ""
+
+#: nova/compute/manager.py:1417
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
+#, python-format
+msgid "%s. Setting instance vm_state to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:1622
+msgid "Rebuilding instance"
+msgstr ""
+
+#: nova/compute/manager.py:1635
+msgid "Invalid state of instance files on shared storage"
+msgstr ""
+
+#: nova/compute/manager.py:1639
+msgid "disk on shared storage, recreating using existing disk"
+msgstr ""
+
+#: nova/compute/manager.py:1643
+#, python-format
+msgid "disk not on shared storagerebuilding from: '%s'"
+msgstr ""
+
+#: nova/compute/manager.py:1726
+#, python-format
+msgid "bringing vm to original state: '%s'"
+msgstr ""
+
+#: nova/compute/manager.py:1758
+#, python-format
+msgid "Detaching from volume api: %s"
+msgstr ""
+
+#: nova/compute/manager.py:1776
+msgid "Rebooting instance"
+msgstr ""
+
+#: nova/compute/manager.py:1801
+#, python-format
+msgid ""
+"trying to reboot a non-running instance: (state: %(state)s expected: "
+"%(running)s)"
+msgstr ""
+
+#: nova/compute/manager.py:1817
+#, python-format
+msgid "Cannot reboot instance: %(exc)s"
+msgstr ""
+
+#: nova/compute/manager.py:1830
+msgid "Instance disappeared during reboot"
+msgstr ""
+
+#: nova/compute/manager.py:1857
+msgid "instance snapshotting"
+msgstr ""
+
+#: nova/compute/manager.py:1863
+#, python-format
+msgid ""
+"trying to snapshot a non-running instance: (state: %(state)s expected: "
+"%(running)s)"
+msgstr ""
+
+#: nova/compute/manager.py:1924
+#, python-format
+msgid "Found %(num_images)d images (rotation: %(rotation)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1931
+#, python-format
+msgid "Rotating out %d backups"
+msgstr ""
+
+#: nova/compute/manager.py:1936
+#, python-format
+msgid "Deleting image %s"
+msgstr ""
+
+#: nova/compute/manager.py:1964
+#, python-format
+msgid "Failed to set admin password. Instance %s is not running"
+msgstr ""
+
+#: nova/compute/manager.py:1971
+msgid "Root password set"
+msgstr ""
+
+#: nova/compute/manager.py:1978
+msgid "set_admin_password is not implemented by this driver or guest instance."
+msgstr ""
+
+#: nova/compute/manager.py:1993
+#, python-format
+msgid "set_admin_password failed: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2000
+msgid "error setting admin password"
+msgstr ""
+
+#: nova/compute/manager.py:2013
+#, python-format
+msgid ""
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
+msgstr ""
+
+#: nova/compute/manager.py:2017
+#, python-format
+msgid "injecting file to %(path)s"
+msgstr ""
+
+#: nova/compute/manager.py:2037
+msgid ""
+"Unable to find a different image to use for rescue VM, using instance's "
+"current image"
+msgstr ""
+
+#: nova/compute/manager.py:2050
+msgid "Rescuing"
+msgstr ""
+
+#: nova/compute/manager.py:2069
+msgid "Error trying to Rescue Instance"
+msgstr ""
+
+#: nova/compute/manager.py:2073
+#, python-format
+msgid "Driver Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2091
+msgid "Unrescuing"
+msgstr ""
+
+#: nova/compute/manager.py:2112
+#, python-format
+msgid "Changing instance metadata according to %(diff)r"
+msgstr ""
+
+#: nova/compute/manager.py:2337
+msgid "Instance has no source host"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+msgid "destination same as source!"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+msgid "Migrating"
+msgstr ""
+
+#: nova/compute/manager.py:2605
+#, python-format
+msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgstr ""
+
+#: nova/compute/manager.py:2668
+msgid "Pausing"
+msgstr ""
+
+#: nova/compute/manager.py:2686
+msgid "Unpausing"
+msgstr ""
+
+#: nova/compute/manager.py:2724
+msgid "Retrieving diagnostics"
+msgstr ""
+
+#: nova/compute/manager.py:2755
+msgid "Resuming"
+msgstr ""
+
+#: nova/compute/manager.py:2775
+msgid "Reset network"
+msgstr ""
+
+#: nova/compute/manager.py:2780
+msgid "Inject network info"
+msgstr ""
+
+#: nova/compute/manager.py:2783
+#, python-format
+msgid "network_info to inject: |%s|"
+msgstr ""
+
+#: nova/compute/manager.py:2800
+msgid "Get console output"
+msgstr ""
+
+#: nova/compute/manager.py:2827
+msgid "Getting vnc console"
+msgstr ""
+
+#: nova/compute/manager.py:2862
+msgid "Getting spice console"
+msgstr ""
+
+#: nova/compute/manager.py:2909
+#, python-format
+msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
+msgstr ""
+
+#: nova/compute/manager.py:2959
+#, python-format
+msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
+msgstr ""
+
+#: nova/compute/manager.py:2968
+#, python-format
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
+msgstr ""
+
+#: nova/compute/manager.py:2983
+#, python-format
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
+msgstr ""
+
+#: nova/compute/manager.py:3013
+#, python-format
+msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
+msgstr ""
+
+#: nova/compute/manager.py:3023
+msgid "Detaching volume from unknown instance"
+msgstr ""
+
+#: nova/compute/manager.py:3030
+#, python-format
+msgid "Failed to detach volume %(volume_id)s from %(mp)s"
+msgstr ""
+
+#: nova/compute/manager.py:3053
+msgid "Updating volume usage cache with totals"
+msgstr ""
+
+#: nova/compute/manager.py:3089
+#, python-format
+msgid "allocate_port_for_instance returned %(ports)s ports"
+msgstr ""
+
+#: nova/compute/manager.py:3109
+#, python-format
+msgid "Port %(port_id)s is not attached"
+msgstr ""
+
+#: nova/compute/manager.py:3123
+#, python-format
+msgid "Host %(host)s not found"
+msgstr ""
+
+#: nova/compute/manager.py:3276
+#, python-format
+msgid "Pre live migration failed at  %(dest)s"
+msgstr ""
+
+#: nova/compute/manager.py:3304
+msgid "_post_live_migration() is started.."
+msgstr ""
+
+#: nova/compute/manager.py:3359
+#, python-format
+msgid "Migrating instance to %(dest)s finished successfully."
+msgstr ""
+
+#: nova/compute/manager.py:3361
+msgid ""
+"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
+"with matching name.\" This error can be safely ignored."
+msgstr ""
+
+#: nova/compute/manager.py:3376
+msgid "Post operation of migration started"
+msgstr ""
+
+#: nova/compute/manager.py:3408
+#, python-format
+msgid "Failed to get compute_info for %s"
+msgstr ""
+
+#: nova/compute/manager.py:3537
+msgid "Updated the info_cache for instance"
+msgstr ""
+
+#: nova/compute/manager.py:3587
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:3593
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:3602
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:3609
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr ""
+
+#: nova/compute/manager.py:3613
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:3620
+#, python-format
+msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
+msgstr ""
+
+#: nova/compute/manager.py:3629
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:3646
+#, python-format
+msgid ""
+"Running instance usage audit for host %(host)s from %(begin_time)s to "
+"%(end_time)s. %(number_instances)s instances."
+msgstr ""
+
+#: nova/compute/manager.py:3665
+#, python-format
+msgid "Failed to generate usage audit for instance on host %s"
+msgstr ""
+
+#: nova/compute/manager.py:3689
+msgid "Updating bandwidth usage cache"
+msgstr ""
+
+#: nova/compute/manager.py:3806
+msgid "Updating volume usage cache"
+msgstr ""
+
+#: nova/compute/manager.py:3823
+msgid "Updating host status"
+msgstr ""
+
+#: nova/compute/manager.py:3850
+#, python-format
+msgid ""
+"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
+"the hypervisor."
+msgstr ""
+
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
+msgid "During sync_power_state the instance has a pending task. Skip."
+msgstr ""
+
+#: nova/compute/manager.py:3892
+#, python-format
+msgid ""
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:3930
+msgid "Instance shutdown by itself. Calling the stop API."
+msgstr ""
+
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
+msgid "error during stop() in sync_power_state."
+msgstr ""
+
+#: nova/compute/manager.py:3946
+msgid "Instance is suspended unexpectedly. Calling the stop API."
+msgstr ""
+
+#: nova/compute/manager.py:3962
+msgid "Instance is paused unexpectedly. Ignore."
+msgstr ""
+
+#: nova/compute/manager.py:3968
+msgid "Instance is unexpectedly not found. Ignore."
+msgstr ""
+
+#: nova/compute/manager.py:3974
+msgid "Instance is not stopped. Calling the stop API."
+msgstr ""
+
+#: nova/compute/manager.py:3990
+msgid "Instance is not (soft-)deleted."
+msgstr ""
+
+#: nova/compute/manager.py:3998
+msgid "CONF.reclaim_instance_interval <= 0, skipping..."
+msgstr ""
+
+#: nova/compute/manager.py:4010
+msgid "Reclaiming deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:4037
+#, python-format
+msgid "Deleting orphan compute node %s"
+msgstr ""
+
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
+#, python-format
+msgid "No service record for host %s"
+msgstr ""
+
+#: nova/compute/manager.py:4088
+#, python-format
+msgid ""
+"Detected instance with name label '%(name)s' which is marked as DELETED "
+"but still present on host."
+msgstr ""
+
+#: nova/compute/manager.py:4095
+#, python-format
+msgid ""
+"Destroying instance with name label '%(name)s' which is marked as DELETED"
+" but still present on host."
+msgstr ""
+
+#: nova/compute/manager.py:4102
+#, python-format
+msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgstr ""
+
+#: nova/compute/manager.py:4129
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:92
+msgid ""
+"Host field should not be set on the instance until resources have been "
+"claimed."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:97
+msgid ""
+"Node field should be not be set on the instance until resources have been"
+" claimed."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:244
+msgid "Auditing locally available compute resources"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:249
+msgid ""
+"Virt driver does not support 'get_available_resource'  Compute tracking "
+"is disabled."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:301
+#, python-format
+msgid "Compute_service record created for %(host)s:%(node)s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:307
+#, python-format
+msgid "Compute_service record updated for %(host)s:%(node)s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:331
+#, python-format
+msgid "Hypervisor: free ram (MB): %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:332
+#, python-format
+msgid "Hypervisor: free disk (GB): %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:337
+#, python-format
+msgid "Hypervisor: free VCPUs: %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:339
+msgid "Hypervisor: VCPU information unavailable"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:346
+#, python-format
+msgid "Free ram (MB): %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:347
+#, python-format
+msgid "Free disk (GB): %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:352
+#, python-format
+msgid "Free VCPUS: %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:354
+msgid "Free VCPU information unavailable"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:383
+#, python-format
+msgid "Updating from migration %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:443
+msgid "Instance not resizing, skipping migration."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:458
+msgid "InstanceType could not be found, skipping migration."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:542
+#, python-format
+msgid ""
+"Detected running orphan instance: %(uuid)s (consuming %(memory_mb)s MB "
+"memory"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:555
+#, python-format
+msgid "Missing keys: %s"
+msgstr ""
+
+#: nova/compute/rpcapi.py:51
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/rpcapi.py:54
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/utils.py:141
+#, python-format
+msgid "Using %(prefix)s instead of %(req_prefix)s"
+msgstr ""
+
+#: nova/conductor/api.py:373
+msgid ""
+"Timed out waiting for nova-conductor. Is it running? Or did this service "
+"start before nova-conductor?"
+msgstr ""
+
+#: nova/conductor/manager.py:91
+#, python-format
+msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
+msgstr ""
+
+#: nova/conductor/manager.py:263
+msgid "Invalid block_device_mapping_destroy invocation"
+msgstr ""
+
+#: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
+msgid "Adding console"
+msgstr ""
+
+#: nova/console/manager.py:101 nova/console/vmrc_manager.py:113
+#, python-format
+msgid "Tried to remove non-existent console %(console_id)s."
+msgstr ""
+
+#: nova/console/vmrc_manager.py:116
+#, python-format
+msgid "Removing console %(console_id)s."
+msgstr ""
+
+#: nova/console/websocketproxy.py:54
+msgid "Invalid Token"
+msgstr ""
+
+#: nova/console/websocketproxy.py:73
+msgid "Invalid Connection Info"
+msgstr ""
+
+#: nova/console/xvp.py:100
+msgid "Rebuilding xvp conf"
+msgstr ""
+
+#: nova/console/xvp.py:119
+#, python-format
+msgid "Re-wrote %s"
+msgstr ""
+
+#: nova/console/xvp.py:124
+msgid "Failed to write configuration file"
+msgstr ""
+
+#: nova/console/xvp.py:127
+msgid "Stopping xvp"
+msgstr ""
+
+#: nova/console/xvp.py:140
+msgid "Starting xvp"
+msgstr ""
+
+#: nova/console/xvp.py:147
+#, python-format
+msgid "Error starting xvp: %s"
+msgstr ""
+
+#: nova/console/xvp.py:150
+msgid "Restarting xvp"
+msgstr ""
+
+#: nova/console/xvp.py:152
+msgid "xvp not running..."
+msgstr ""
+
+#: nova/console/xvp.py:203
+msgid "Failed to run xvp."
+msgstr ""
+
+#: nova/consoleauth/manager.py:89
+#, python-format
+msgid "Received Token: %(token)s, %(token_dict)s)"
+msgstr ""
+
+#: nova/consoleauth/manager.py:113
+#, python-format
+msgid "Checking Token: %(token)s, %(token_valid)s)"
+msgstr ""
+
+#: nova/db/api.py:592
+msgid "Failed to notify cells of instance destroy"
+msgstr ""
+
+#: nova/db/api.py:674 nova/db/api.py:695
+msgid "Failed to notify cells of instance update"
+msgstr ""
+
+#: nova/db/api.py:1453
+msgid "Failed to notify cells of bw_usage update"
+msgstr ""
+
+#: nova/db/api.py:1588
+msgid "Failed to notify cells of instance fault"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:160
+#, python-format
+msgid "Deadlock detected when running '%(func_name)s': Retrying..."
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:195
+msgid "model or base_model parameter should be subclass of NovaBase"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:1411
+#, python-format
+msgid ""
+"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
+"empty, \"global\" or \"project\""
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:1549
+#, python-format
+msgid "Invalid instance id %s in request"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:2908
+#, python-format
+msgid "Change will make usage less than 0 for the following resources: %(unders)s"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:4416
+#, python-format
+msgid ""
+"Volume(%s) has lower stats then what is in the database. Instance must "
+"have been rebooted or crashed. Updating totals."
+msgstr ""
+
+#: nova/db/sqlalchemy/migration.py:69
+#: nova/virt/baremetal/db/sqlalchemy/migration.py:66
+msgid "version should be an integer"
+msgstr ""
+
+#: nova/db/sqlalchemy/migration.py:96
+#: nova/virt/baremetal/db/sqlalchemy/migration.py:94
+msgid "Upgrade DB using Essex release first."
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:63
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:69
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:171
+#, python-format
+msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:205
+#, python-format
+msgid "Missing column %(table)s.%(column)s in shadow table"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:211
+#, python-format
+msgid ""
+"Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
+"%(shadow_c_type)s"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:220
+#, python-format
+msgid "Extra column %(table)%.%(column)s in shadow table"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:241
+msgid "Specify `table_name` or `table` param"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:244
+msgid "Specify only one param `table_name` `table`"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:265
+#: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
+#: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
+msgid "Exception while creating table."
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:62
+msgid "Exception while seeding instance_types table"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/145_add_volume_usage_cache.py:68
+msgid "volume_usage_cache table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:77
+#, python-format
+msgid "table '%s' not dropped"
+msgstr ""
+
+#: nova/image/glance.py:187
+#, python-format
+msgid ""
+"Error contacting glance server '%(host)s:%(port)s' for '%(method)s', "
+"%(extra)s."
+msgstr ""
+
+#: nova/image/glance.py:495
+#, python-format
+msgid "fetching image %s from glance"
+msgstr ""
+
+#: nova/image/s3.py:335
+#, python-format
+msgid "Failed to download %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:352
+#, python-format
+msgid "Failed to decrypt %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:362
+#, python-format
+msgid "Failed to untar %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:372
+#, python-format
+msgid "Failed to upload %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:396
+#, python-format
+msgid "Failed to decrypt private key: %s"
+msgstr ""
+
+#: nova/image/s3.py:403
+#, python-format
+msgid "Failed to decrypt initialization vector: %s"
+msgstr ""
+
+#: nova/image/s3.py:414
+#, python-format
+msgid "Failed to decrypt image file %(image_file)s: %(err)s"
+msgstr ""
+
+#: nova/image/s3.py:426
+msgid "Unsafe filenames in image"
+msgstr ""
+
+#: nova/ipv6/account_identifier.py:38 nova/ipv6/rfc2462.py:34
+#, python-format
+msgid "Bad mac for to_global_ipv6: %s"
+msgstr ""
+
+#: nova/ipv6/account_identifier.py:40 nova/ipv6/rfc2462.py:36
+#, python-format
+msgid "Bad prefix for to_global_ipv6: %s"
+msgstr ""
+
+#: nova/ipv6/account_identifier.py:42
+#, python-format
+msgid "Bad project_id for to_global_ipv6: %s"
+msgstr ""
+
+#: nova/network/api.py:56
+msgid "instance is a required argument to use @refresh_cache"
+msgstr ""
+
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
+msgid "Failed storing info cache"
+msgstr ""
+
+#: nova/network/api.py:248
+#, python-format
+msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
+msgstr ""
+
+#: nova/network/driver.py:40
+msgid "Network driver option required, but not specified"
+msgstr ""
+
+#: nova/network/driver.py:43
+#, python-format
+msgid "Loading network driver '%s'"
+msgstr ""
+
+#: nova/network/floating_ips.py:88
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/floating_ips.py:98 nova/network/floating_ips.py:374
+#, python-format
+msgid "Interface %(interface)s not found"
+msgstr ""
+
+#: nova/network/floating_ips.py:122
+#, python-format
+msgid "floating IP allocation for instance |%(floating_address)s|"
+msgstr ""
+
+#: nova/network/floating_ips.py:179
+msgid "Floating IP is not associated. Ignore."
+msgstr ""
+
+#: nova/network/floating_ips.py:197
+#, python-format
+msgid "Address |%(address)s| is not allocated"
+msgstr ""
+
+#: nova/network/floating_ips.py:201
+#, python-format
+msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
+msgstr ""
+
+#: nova/network/floating_ips.py:221
+#, python-format
+msgid "Quota exceeded for %(pid)s, tried to allocate floating IP"
+msgstr ""
+
+#: nova/network/floating_ips.py:282
+msgid "Failed to update usages deallocating floating IP"
+msgstr ""
+
+#: nova/network/floating_ips.py:532
+#, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/floating_ips.py:539
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr ""
+
+#: nova/network/floating_ips.py:574
+#, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/floating_ips.py:582
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr ""
+
+#: nova/network/floating_ips.py:630
+#, python-format
+msgid ""
+"Database inconsistency: DNS domain |%s| is registered in the Nova db but "
+"not visible to either the floating or instance DNS driver. It will be "
+"ignored."
+msgstr ""
+
+#: nova/network/floating_ips.py:670
+#, python-format
+msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
+msgstr ""
+
+#: nova/network/floating_ips.py:679
+#, python-format
+msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
+msgstr ""
+
+#: nova/network/ldapdns.py:100
+#, python-format
+msgid ""
+"Found multiple matches for domain %(domain)s.\n"
+"%(entry)s"
+msgstr ""
+
+#: nova/network/ldapdns.py:127
+#, python-format
+msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
+msgstr ""
+
+#: nova/network/ldapdns.py:322
+msgid "This driver only supports type 'a' entries."
+msgstr ""
+
+#: nova/network/ldapdns.py:365
+msgid "This shouldn't be getting called except during testing."
+msgstr ""
+
+#: nova/network/linux_net.py:219
+#, python-format
+msgid "Attempted to remove chain %s which does not exist"
+msgstr ""
+
+#: nova/network/linux_net.py:254
+#, python-format
+msgid "Unknown chain: %r"
+msgstr ""
+
+#: nova/network/linux_net.py:279
+#, python-format
+msgid ""
+"Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
+"%(top)r"
+msgstr ""
+
+#: nova/network/linux_net.py:424
+msgid "IPTablesManager.apply completed with success"
+msgstr ""
+
+#: nova/network/linux_net.py:680
+#, python-format
+msgid "arping error for ip %s"
+msgstr ""
+
+#: nova/network/linux_net.py:730
+#, python-format
+msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
+msgstr ""
+
+#: nova/network/linux_net.py:778
+#, python-format
+msgid "Error deleting conntrack entries for %s"
+msgstr ""
+
+#: nova/network/linux_net.py:977
+#, python-format
+msgid "Pid %d is stale, skip killing dnsmasq"
+msgstr ""
+
+#: nova/network/linux_net.py:1022
+#, python-format
+msgid "Hupping dnsmasq threw %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1024
+#, python-format
+msgid "Pid %d is stale, relaunching dnsmasq"
+msgstr ""
+
+#: nova/network/linux_net.py:1104
+#, python-format
+msgid "killing radvd threw %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1106
+#, python-format
+msgid "Pid %d is stale, relaunching radvd"
+msgstr ""
+
+#: nova/network/linux_net.py:1282
+#, python-format
+msgid "Net device removed: '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1285
+#, python-format
+msgid "Failed removing net device: '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1403
+#, python-format
+msgid "Starting VLAN interface %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1449
+#, python-format
+msgid "Starting Bridge %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1461
+#, python-format
+msgid "Adding interface %(interface)s to bridge %(bridge)s"
+msgstr ""
+
+#: nova/network/linux_net.py:1497
+#, python-format
+msgid "Failed to add interface: %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1734
+#, python-format
+msgid "Starting bridge %s "
+msgstr ""
+
+#: nova/network/linux_net.py:1742
+#, python-format
+msgid "Done starting bridge %s"
+msgstr ""
+
+#: nova/network/manager.py:364
+#, python-format
+msgid "Disassociated %s stale fixed ip(s)"
+msgstr ""
+
+#: nova/network/manager.py:368
+msgid "setting network host"
+msgstr ""
+
+#: nova/network/manager.py:480
+msgid "network allocations"
+msgstr ""
+
+#: nova/network/manager.py:487
+#, python-format
+msgid "networks retrieved for instance: |%(networks_list)s|"
+msgstr ""
+
+#: nova/network/manager.py:535
+msgid "network deallocation for instance"
+msgstr ""
+
+#: nova/network/manager.py:801
+#, python-format
+msgid ""
+"instance-dns-zone is |%(domain)s|, which is in availability zone "
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
+msgstr ""
+
+#: nova/network/manager.py:827
+#, python-format
+msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
+msgstr ""
+
+#: nova/network/manager.py:879
+msgid "Failed to update usages deallocating fixed IP"
+msgstr ""
+
+#: nova/network/manager.py:911
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:934
+#, python-format
+msgid "Leased IP |%(address)s|"
+msgstr ""
+
+#: nova/network/manager.py:938
+#, python-format
+msgid "IP %s leased that is not associated"
+msgstr ""
+
+#: nova/network/manager.py:947
+#, python-format
+msgid "IP |%s| leased that isn't allocated"
+msgstr ""
+
+#: nova/network/manager.py:952
+#, python-format
+msgid "Released IP |%(address)s|"
+msgstr ""
+
+#: nova/network/manager.py:956
+#, python-format
+msgid "IP %s released that is not associated"
+msgstr ""
+
+#: nova/network/manager.py:960
+#, python-format
+msgid "IP %s released that was not leased"
+msgstr ""
+
+#: nova/network/manager.py:979
+#, python-format
+msgid "%s must be an integer"
+msgstr ""
+
+#: nova/network/manager.py:1003
+msgid "Maximum allowed length for 'label' is 255."
+msgstr ""
+
+#: nova/network/manager.py:1023
+#, python-format
+msgid ""
+"Subnet(s) too large, defaulting to /%s.  To override, specify "
+"network_size flag."
+msgstr ""
+
+#: nova/network/manager.py:1105
+msgid "cidr already in use"
+msgstr ""
+
+#: nova/network/manager.py:1108
+#, python-format
+msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
+msgstr ""
+
+#: nova/network/manager.py:1119
+#, python-format
+msgid ""
+"requested cidr (%(cidr)s) conflicts with existing smaller cidr "
+"(%(smaller)s)"
+msgstr ""
+
+#: nova/network/manager.py:1176
+msgid "Network already exists!"
+msgstr ""
+
+#: nova/network/manager.py:1195
+#, python-format
+msgid "Network must be disassociated from project %s before delete"
+msgstr ""
+
+#: nova/network/manager.py:1795
+msgid ""
+"The sum between the number of networks and the vlan start cannot be "
+"greater than 4094"
+msgstr ""
+
+#: nova/network/manager.py:1802
+#, python-format
+msgid ""
+"The network range is not big enough to fit %(num_networks)s networks. "
+"Network size is %(network_size)s"
+msgstr ""
+
+#: nova/network/minidns.py:48
+#, python-format
+msgid "minidns file is |%s|"
+msgstr ""
+
+#: nova/network/minidns.py:75 nova/network/minidns.py:106
+msgid "Invalid name"
+msgstr ""
+
+#: nova/network/minidns.py:78
+msgid "This driver only supports type 'a'"
+msgstr ""
+
+#: nova/network/minidns.py:122
+#, python-format
+msgid "Cannot delete entry |%s|"
+msgstr ""
+
+#: nova/network/minidns.py:201
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: nova/network/minidns.py:207
+#, python-format
+msgid "Cannot delete domain |%s|"
+msgstr ""
+
+#: nova/network/model.py:379
+msgid "v4 subnets are required for legacy nw_info"
+msgstr ""
+
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:152
+#, python-format
+msgid "allocate_for_instance() for %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:155
+#, python-format
+msgid "empty project id for instance %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:201
+#, python-format
+msgid ""
+"Multiple security groups found matching '%s'. Use an ID to be more "
+"specific."
+msgstr ""
+
+#: nova/network/quantumv2/api.py:270
+msgid "Port not found"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:278
+#, python-format
+msgid "Fail to delete port %(portid)s with failure: %(exception)s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:318
+#, python-format
+msgid "deallocate_for_instance() for %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:327
+#, python-format
+msgid "Failed to delete quantum port %(portid)s "
+msgstr ""
+
+#: nova/network/quantumv2/api.py:349
+#, python-format
+msgid "Failed to delete quantum port %(port_id)s "
+msgstr ""
+
+#: nova/network/quantumv2/api.py:373
+#, python-format
+msgid "get_instance_nw_info() for %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:405
+#, python-format
+msgid ""
+"Unable to update port %(portid)s on subnet %(subnet_id)s with failure: "
+"%(exception)s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:435
+#, python-format
+msgid "Unable to update port %(portid)s with failure: %(exception)s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:445
+#, python-format
+msgid "validate_networks() for %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:688
+#, python-format
+msgid "Multiple floating IP pools matches found for name '%s'"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:53
+#, python-format
+msgid "Quantum Error creating security group %s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:106
+#, python-format
+msgid "Quantum security group %s not found"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
+#, python-format
+msgid "Quantum Error: %s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:129
+msgid "Quantum Error getting security groups"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:139
+msgid "Security group id should be uuid"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:173
+#, python-format
+msgid "Quantum Error getting security group %s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
+msgid "Quantum Error:"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:230
+#, python-format
+msgid "Quantum Error unable to delete %s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:241
+#, python-format
+msgid "Quantum security group rule %s not found"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:358
+#, python-format
+msgid ""
+"Cannot add security group %(name)s to %(instance)s since the port "
+"%(port_id)s does not meet security requirements"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
+#, python-format
+msgid "Adding security group %(security_group_id)s to port %(port_id)s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:428
+#, python-format
+msgid ""
+"Security group %(security_group_name)s not assocaited with the instance "
+"%(instance)s"
+msgstr ""
+
+#: nova/network/security_group/security_group_base.py:137
+#, python-format
+msgid "This rule already exists in group %s"
+msgstr ""
+
+#: nova/openstack/common/excutils.py:48
+#, python-format
+msgid "Original exception being dropped: %s"
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:102
+#, python-format
+msgid "Could not release the acquired lock `%s`"
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:188
+#, python-format
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:199
+#, python-format
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:226
+#, python-format
+msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:234
+#, python-format
+msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
+msgstr ""
+
+#: nova/openstack/common/log.py:244
+#, python-format
+msgid "Deprecated: %s"
+msgstr ""
+
+#: nova/openstack/common/log.py:336
+#, python-format
+msgid "Error loading logging config %(log_config)s: %(err_msg)s"
+msgstr ""
+
+#: nova/openstack/common/log.py:386
+#, python-format
+msgid "syslog facility must be one of: %s"
+msgstr ""
+
+#: nova/openstack/common/log.py:555
+#, python-format
+msgid "Fatal call to deprecated config: %(msg)s"
+msgstr ""
+
+#: nova/openstack/common/loopingcall.py:84
+#, python-format
+msgid "task run outlasted interval by %s sec"
+msgstr ""
+
+#: nova/openstack/common/loopingcall.py:91
+msgid "in fixed duration looping call"
+msgstr ""
+
+#: nova/openstack/common/loopingcall.py:131
+#, python-format
+msgid "Dynamic looping call sleeping for %.02f seconds"
+msgstr ""
+
+#: nova/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:41
+#, python-format
+msgid "Unexpected argument for periodic task creation: %(arg)s."
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:132
+#, python-format
+msgid "Skipping periodic task %(task)s because its interval is negative"
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:137
+#, python-format
+msgid "Skipping periodic task %(task)s because it is disabled"
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:175
+#, python-format
+msgid "Running periodic task %(full_task_name)s"
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:183
+#, python-format
+msgid "Error during %(full_task_name)s: %(e)s"
+msgstr ""
+
+#: nova/openstack/common/policy.py:394
+#, python-format
+msgid "Failed to understand rule %(rule)s"
+msgstr ""
+
+#: nova/openstack/common/policy.py:404
+#, python-format
+msgid "No handler for matches of kind %s"
+msgstr ""
+
+#: nova/openstack/common/policy.py:679
+#, python-format
+msgid "Failed to understand rule %(rule)r"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+msgid "Full set of CONF:"
+msgstr ""
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/session.py:461
+msgid "DB exception wrapped."
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/session.py:512
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/session.py:584
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
+#: nova/openstack/common/notifier/api.py:125
+#, python-format
+msgid "%s not in valid priorities"
+msgstr ""
+
+#: nova/openstack/common/notifier/api.py:141
+#, python-format
+msgid ""
+"Problem '%(e)s' attempting to send to notification system. "
+"Payload=%(payload)s"
+msgstr ""
+
+#: nova/openstack/common/notifier/api.py:171
+#, python-format
+msgid "Failed to load notifier %s. These notifications will not be sent."
+msgstr ""
+
+#: nova/openstack/common/notifier/rabbit_notifier.py:27
+msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
+msgstr ""
+
+#: nova/openstack/common/notifier/rpc_notifier.py:45
+#: nova/openstack/common/notifier/rpc_notifier2.py:51
+#, python-format
+msgid "Could not send notification to %(topic)s. Payload=%(message)s"
+msgstr ""
+
+#: nova/openstack/common/plugin/pluginmanager.py:66
+#, python-format
+msgid "Failed to load plugin %(plug)s: %(exc)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/__init__.py:106
+#, python-format
+msgid ""
+"A RPC is being made while holding a lock. The locks currently held are "
+"%(locks)s. This is probably a bug. Please report it. Include the "
+"following: [%(stack)s]."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:75
+msgid "Pool creating new connection"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:200
+#, python-format
+msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:208
+#, python-format
+msgid ""
+"Number of call waiters is greater than warning threshhold: %d. There "
+"could be a MulticallProxyWaiter leak."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:291
+#, python-format
+msgid "unpacked context: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:337
+#, python-format
+msgid "UNIQUE_ID is %s."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:406
+#, python-format
+msgid "received %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:414
+#, python-format
+msgid "no method for message: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:415
+#, python-format
+msgid "No method for message: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
+#, python-format
+msgid "Expected exception during message handling (%s)"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
+msgid "Exception during message handling"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:586
+#, python-format
+msgid "Making synchronous call on %s ..."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:589
+#, python-format
+msgid "MSG_ID is %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:623
+#, python-format
+msgid "Making asynchronous cast on %s..."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:632
+msgid "Making asynchronous fanout cast..."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:660
+#, python-format
+msgid "Sending %(event_type)s on %(topic)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:75
+msgid "An unknown RPC related exception occurred."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:105
+#, python-format
+msgid ""
+"Remote error: %(exc_type)s %(value)s\n"
+"%(traceback)s."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:122
+#, python-format
+msgid ""
+"Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
+" \"%(method)s\" info: \"%(info)s\""
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:138
+#: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
+msgid "<unknown>"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:144
+#, python-format
+msgid "Found duplicate message(%(msg_id)s). Skipping it."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:148
+msgid "Invalid reuse of an RPC connection."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:152
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:157
+#, python-format
+msgid ""
+"Specified RPC envelope version, %(version)s, not supported by this "
+"endpoint."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
+#, python-format
+msgid "Failed to sanitize %(item)s. Key error %(err)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:307
+#, python-format
+msgid "Returning exception %s to caller"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:169
+#: nova/openstack/common/rpc/impl_qpid.py:133
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:480
+#, python-format
+msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:502
+#, python-format
+msgid "Connected to AMQP server on %(hostname)s:%(port)d"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:539
+#, python-format
+msgid ""
+"Unable to connect to AMQP server on %(hostname)s:%(port)d after "
+"%(max_retries)d tries: %(err_str)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:555
+#, python-format
+msgid ""
+"AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
+"again in %(sleep_time)d seconds."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:609
+#: nova/openstack/common/rpc/impl_qpid.py:404
+#, python-format
+msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:627
+#: nova/openstack/common/rpc/impl_qpid.py:419
+#, python-format
+msgid "Timed out waiting for RPC response: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:631
+#: nova/openstack/common/rpc/impl_qpid.py:423
+#, python-format
+msgid "Failed to consume message from queue: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:670
+#: nova/openstack/common/rpc/impl_qpid.py:458
+#, python-format
+msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_qpid.py:352
+#, python-format
+msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_qpid.py:358
+#, python-format
+msgid "Connected to AMQP server on %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_qpid.py:371
+msgid "Re-established AMQP queues"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_qpid.py:431
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:97
+msgid "JSON serialization failed."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:104
+#, python-format
+msgid "Deserializing: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:140
+#, python-format
+msgid "Connecting to %(addr)s with %(type)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:141
+#, python-format
+msgid "-> Subscribed to %(subscribe)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:142
+#, python-format
+msgid "-> bind: %(bind)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:150
+msgid "Could not open socket."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:162
+#, python-format
+msgid "Subscribing to %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:204
+msgid "You cannot recv on this socket."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:209
+msgid "You cannot send on this socket."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:273
+#, python-format
+msgid "Running func with context: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:311
+msgid "Sending reply"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:345
+msgid "RPC message did not include method."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:380
+msgid "Registering reactor"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:392
+msgid "In reactor registered"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:407
+msgid "Out reactor registered"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:411
+msgid "Consuming socket"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:453
+#, python-format
+msgid "CONSUMER GOT %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:465
+#, python-format
+msgid "Creating proxy for topic: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:471
+msgid "Topic contained dangerous characters."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:496
+#, python-format
+msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:505
+msgid "Topic socket file creation failed."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:510
+#, python-format
+msgid "ROUTER RELAY-OUT QUEUED %(data)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:513
+#, python-format
+msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:532
+#, python-format
+msgid "Could not create IPC directory %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:542
+msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:576
+#, python-format
+msgid "CONSUMER RECEIVED DATA: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:578
+#, python-format
+msgid "ROUTER RELAY-OUT %(data)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:600
+msgid "ZMQ Envelope version unsupported or unknown."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:628
+msgid "Skipping topic registration. Already registered."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:635
+#, python-format
+msgid "Consumer is a zmq.%s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:687
+msgid "Creating payload"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:700
+msgid "Creating queue socket for reply waiter"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:713
+msgid "Sending cast"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:716
+msgid "Cast sent; Waiting reply"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:719
+#, python-format
+msgid "Received message: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:720
+msgid "Unpacking response"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:729
+msgid "Unsupported or unknown ZMQ envelope returned."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:736
+msgid "RPC Message Invalid."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:760
+#, python-format
+msgid "%(msg)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:763
+#, python-format
+msgid "Sending message(s) to: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:767
+msgid "No matchmaker results. Not casting."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:770
+msgid "No match from matchmaker."
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:53
+msgid "Match not found by MatchMaker."
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:89
+msgid "Matchmaker does not implement registration or heartbeat."
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:239
+#, python-format
+msgid "Matchmaker unregistered: %s, %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:250
+msgid "Register before starting heartbeat."
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:343
+#: nova/openstack/common/rpc/matchmaker.py:361
+#, python-format
+msgid "No key defining hosts for topic '%s', see ringfile"
+msgstr ""
+
+#: nova/scheduler/chance.py:51
+msgid "Is the appropriate service running?"
+msgstr ""
+
+#: nova/scheduler/chance.py:56
+msgid "Could not find another compute"
+msgstr ""
+
+#: nova/scheduler/driver.py:61
+msgid "Exception during scheduler.run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#, python-format
+msgid "Setting instance to %(state)s state."
+msgstr ""
+
+#: nova/scheduler/driver.py:156
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:164
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:169
+msgid "Driver must implement select_hosts"
+msgstr ""
+
+#: nova/scheduler/driver.py:339
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:73
+#, python-format
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:239
+msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:256
+#, python-format
+msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:288
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:356
+#, python-format
+msgid "Filtered %(hosts)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:361
+#, python-format
+msgid "Weighed %(hosts)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:403
+#, python-format
+msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:308
+#, python-format
+msgid "Host filter ignoring hosts: %s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:320
+#, python-format
+msgid "Host filter forcing available hosts to %s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:323
+#, python-format
+msgid "No hosts matched due to not matching 'force_hosts' value of '%s'"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:336
+#, python-format
+msgid "Host filter forcing available nodes to %s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:339
+#, python-format
+msgid "No nodes matched due to not matching 'force_nodes' value of '%s'"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:379
+#, python-format
+msgid "Ignoring %(service_name)s service update from %(host)s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:384
+#, python-format
+msgid "Received %(service_name)s service update from %(state_key)s."
+msgstr ""
+
+#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/filters/trusted_filter.py:214
+#, python-format
+msgid "No service for compute ID %s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:425
+#, python-format
+msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
+msgstr ""
+
+#: nova/scheduler/manager.py:208
+#, python-format
+msgid "Failed to schedule_%(method)s: %(ex)s"
+msgstr ""
+
+#: nova/scheduler/scheduler_options.py:71
+#, python-format
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgstr ""
+
+#: nova/scheduler/scheduler_options.py:79
+#, python-format
+msgid "Could not decode scheduler options: '%(e)s'"
+msgstr ""
+
+#: nova/scheduler/filters/affinity_filter.py:95
+#, python-format
+msgid "Group affinity: %(host)s in %(configured)s"
+msgstr ""
+
+#: nova/scheduler/filters/aggregate_instance_extra_specs.py:49
+#: nova/scheduler/filters/aggregate_instance_extra_specs.py:56
+#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
+#: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
+#, python-format
+msgid "%(host_state)s fails tenant id on aggregate"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:40
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:44
+#, python-format
+msgid "%(host_state)s is disabled via capabilities"
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:44
+msgid "VCPUs not set; assuming CPU collection broken"
+msgstr ""
+
+#: nova/scheduler/filters/disk_filter.py:47
+#, python-format
+msgid ""
+"%(host_state)s does not have %(requested_disk)s MB usable disk, it only "
+"has %(usable_disk_mb)s MB usable disk."
+msgstr ""
+
+#: nova/scheduler/filters/image_props_filter.py:48
+#, python-format
+msgid ""
+"Instance contains properties %(image_props)s, but no corresponding "
+"capabilities are advertised by the compute node"
+msgstr ""
+
+#: nova/scheduler/filters/image_props_filter.py:61
+#, python-format
+msgid ""
+"Instance properties %(image_props)s are satisfied by compute host "
+"capabilities %(capabilities)s"
+msgstr ""
+
+#: nova/scheduler/filters/image_props_filter.py:66
+#, python-format
+msgid ""
+"Instance contains properties %(image_props)s that are not provided by the"
+" compute node capabilities %(capabilities)s"
+msgstr ""
+
+#: nova/scheduler/filters/image_props_filter.py:82
+#, python-format
+msgid "%(host_state)s does not support requested instance_properties"
+msgstr ""
+
+#: nova/scheduler/filters/io_ops_filter.py:42
+#, python-format
+msgid ""
+"%(host_state)s fails I/O ops check: Max IOs per host is set to "
+"%(max_io_ops)s"
+msgstr ""
+
+#: nova/scheduler/filters/num_instances_filter.py:39
+#, python-format
+msgid ""
+"%(host_state)s fails num_instances check: Max instances per host is set "
+"to %(max_instances)s"
+msgstr ""
+
+#: nova/scheduler/filters/ram_filter.py:46
+#, python-format
+msgid ""
+"%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
+" %(usable_ram)s MB usable ram."
+msgstr ""
+
+#: nova/scheduler/filters/retry_filter.py:41
+#, python-format
+msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
+msgstr ""
+
+#: nova/servicegroup/api.py:60
+#, python-format
+msgid "ServiceGroup driver defined as an instance of %s"
+msgstr ""
+
+#: nova/servicegroup/api.py:66
+#, python-format
+msgid "unknown ServiceGroup driver name: %s"
+msgstr ""
+
+#: nova/servicegroup/api.py:83
+#, python-format
+msgid ""
+"Join new ServiceGroup member %(member_id)s to the %(group_id)s group, "
+"service = %(service)s"
+msgstr ""
+
+#: nova/servicegroup/api.py:90
+#, python-format
+msgid "Check if the given member [%s] is part of the ServiceGroup, is up"
+msgstr ""
+
+#: nova/servicegroup/api.py:99
+#, python-format
+msgid ""
+"Explicitly remove the given member %(member_id)s from the%(group_id)s "
+"group monitoring"
+msgstr ""
+
+#: nova/servicegroup/api.py:106
+#, python-format
+msgid "Returns ALL members of the [%s] ServiceGroup"
+msgstr ""
+
+#: nova/servicegroup/api.py:114
+#, python-format
+msgid "Returns one member of the [%s] group"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:41
+#, python-format
+msgid ""
+"DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
+" group, service = %(service)s"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:45
+msgid "service is a mandatory argument for DB based ServiceGroup driver"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:72
+#, python-format
+msgid "DB_Driver: get_all members of the %s group"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
+msgid "Recovered model server connection!"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
+msgid "model server went away"
+msgstr ""
+
+#: nova/servicegroup/drivers/mc.py:43
+msgid "memcached_servers not defined"
+msgstr ""
+
+#: nova/servicegroup/drivers/mc.py:51
+#, python-format
+msgid ""
+"Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
+"%(group_id)s group, service = %(service)s"
+msgstr ""
+
+#: nova/servicegroup/drivers/mc.py:56
+msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
+msgstr ""
+
+#: nova/servicegroup/drivers/mc.py:74
+#, python-format
+msgid "Memcached_Driver: get_all members of the %s group"
+msgstr ""
+
+#: nova/servicegroup/drivers/zk.py:80
+#, python-format
+msgid ""
+"ZooKeeperDriver: join new member %(id)s to the %(gr)s group, "
+"service=%(sr)s"
+msgstr ""
+
+#: nova/servicegroup/drivers/zk.py:90
+msgid ""
+"Unable to join. It is possible that either another node exists with the "
+"same name, or this node just restarted. We will try again in a short "
+"while to make sure."
+msgstr ""
+
+#: nova/servicegroup/drivers/zk.py:101
+#, python-format
+msgid "ZooKeeperDriver.leave: %(member)s from group %(group)s"
+msgstr ""
+
+#: nova/servicegroup/drivers/zk.py:109
+#, python-format
+msgid "ZooKeeperDriver.leave: %(id)s has not joined to the %(gr)s group"
+msgstr ""
+
+#: nova/storage/linuxscsi.py:71
+#, python-format
+msgid "Trying (%(tries)s) to remove device %(device)s"
+msgstr ""
+
+#: nova/storage/linuxscsi.py:101
+#, python-format
+msgid "Multipath call failed exit (%(code)s)"
+msgstr ""
+
+#: nova/storage/linuxscsi.py:119
+#, python-format
+msgid "Couldn't find multipath device %(line)s"
+msgstr ""
+
+#: nova/storage/linuxscsi.py:123
+#, python-format
+msgid "Found multipath device = %(mdev)s"
+msgstr ""
+
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr ""
+
+#: nova/tests/fake_processutils.py:71
+#, python-format
+msgid "Faking execution of cmd (subprocess): %s"
+msgstr ""
+
+#: nova/tests/fake_processutils.py:79
+#, python-format
+msgid "Faked command matched %s"
+msgstr ""
+
+#: nova/tests/fake_processutils.py:95
+#, python-format
+msgid "Faked command raised an exception %s"
+msgstr ""
+
+#: nova/tests/fake_processutils.py:100
+#, python-format
+msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
+msgstr ""
+
+#: nova/tests/fake_volume.py:188
+msgid "status must be available"
+msgstr ""
+
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
+msgid "already attached"
+msgstr ""
+
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
+msgid "Instance and volume not in same availability_zone"
+msgstr ""
+
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
+msgid "already detached"
+msgstr ""
+
+#: nova/tests/test_hypervapi.py:433
+msgid "fake vswitch not found"
+msgstr ""
+
+#: nova/tests/test_misc.py:59
+#, python-format
+msgid ""
+"The following migrations are missing a downgrade:\n"
+"\t%s"
+msgstr ""
+
+#: nova/tests/test_xenapi.py:897
+#, python-format
+msgid "Creating files in %s to simulate guest agent"
+msgstr ""
+
+#: nova/tests/test_xenapi.py:908
+#, python-format
+msgid "Removing simulated guest agent files in %s"
+msgstr ""
+
+#: nova/tests/api/test_auth.py:79
+msgid "200 Role Match"
+msgstr ""
+
+#: nova/tests/api/test_auth.py:81
+msgid "200 No Roles"
+msgstr ""
+
+#: nova/tests/api/test_auth.py:84
+msgid "unexpected role header"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/test_servers.py:3365
+msgid ""
+"Quota exceeded for instances: Requested 1, but already used 10 of 10 "
+"instances"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/test_servers.py:3370
+msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/test_servers.py:3375
+msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1117
+#: nova/tests/compute/test_compute.py:1168
+#: nova/tests/compute/test_compute.py:1195
+#: nova/tests/compute/test_compute.py:1241
+#: nova/tests/compute/test_compute.py:3804
+#, python-format
+msgid "Running instances: %s"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:1105
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1183
+#: nova/tests/compute/test_compute.py:1213
+#, python-format
+msgid "After terminating instances: %s"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:1723
+msgid "Internal error"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:3815
+#, python-format
+msgid "After force-killing instances: %s"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:4315
+msgid "wrong host/node"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:8904
+msgid "spawn error"
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:177
+#, python-format
+msgid "%(result_str)s: %(result)s is not a dict."
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:191
+#, python-format
+msgid ""
+"Dictionary key mismatch:\n"
+"Extra key(s) in template:\n"
+"%(ex_delta)s\n"
+"Extra key(s) in %(result_str)s:\n"
+"%(res_delta)s\n"
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:202
+#, python-format
+msgid "%(result_str)s: %(result)s is not a list."
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:221
+msgid "Extra list items in template:"
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:225
+#, python-format
+msgid "Extra list items in %(result_str)s:"
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:246
+#: nova/tests/integrated/test_api_samples.py:261
+#, python-format
+msgid ""
+"Values do not match:\n"
+"Template: %(expected)s\n"
+"%(result_str)s: %(result)s"
+msgstr ""
+
+#: nova/tests/integrated/test_login.py:31
+#, python-format
+msgid "flavor: %s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:38
+#, python-format
+msgid ""
+"%(message)s\n"
+"Status Code: %(_status)s\n"
+"Body: %(_body)s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:47
+msgid "Authentication error"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:55
+msgid "Authorization error"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:63
+msgid "Item not found"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:105
+#, python-format
+msgid "Doing %(method)s on %(relative_url)s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:107
+#, python-format
+msgid "Body: %s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:125
+#, python-format
+msgid "%(auth_uri)s => code %(http_status)s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:155
+#, python-format
+msgid "%(relative_uri)s => code %(http_status)s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:165
+msgid "Unexpected status code"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:172
+#, python-format
+msgid "Decoding JSON: %s"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
+#: nova/virt/configdrive.py:97
+#, python-format
+msgid "Added %(filepath)s to config drive"
+msgstr ""
+
+#: nova/virt/driver.py:924
+msgid "Event must be an instance of nova.virt.event.Event"
+msgstr ""
+
+#: nova/virt/driver.py:930
+#, python-format
+msgid "Exception dispatching event %(event)s: %(ex)s"
+msgstr ""
+
+#: nova/virt/driver.py:952
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/virt/driver.py:955
+#, python-format
+msgid "Loading compute driver '%s'"
+msgstr ""
+
+#: nova/virt/driver.py:962
+msgid "Unable to load the virtualization driver"
+msgstr ""
+
+#: nova/virt/fake.py:212
+#, python-format
+msgid "Key '%(key)s' not in instances '%(inst)s'"
+msgstr ""
+
+#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+msgid "Attempted to unfilter instance which is not filtered"
+msgstr ""
+
+#: nova/virt/firewall.py:195
+msgid "Filters added to instance"
+msgstr ""
+
+#: nova/virt/firewall.py:197
+msgid "Provider Firewall Rules refreshed"
+msgstr ""
+
+#: nova/virt/firewall.py:377
+#, python-format
+msgid "Adding security group rule: %r"
+msgstr ""
+
+#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#, python-format
+msgid "Adding provider rule: %s"
+msgstr ""
+
+#: nova/virt/images.py:113
+msgid "Snapshot list encountered but no header found!"
+msgstr ""
+
+#: nova/virt/images.py:215
+msgid "'qemu-img info' parsing failed."
+msgstr ""
+
+#: nova/virt/images.py:221
+#, python-format
+msgid "fmt=%(fmt)s backed by: %(backing_file)s"
+msgstr ""
+
+#: nova/virt/images.py:233
+#, python-format
+msgid "Converted to raw, but format is now %s"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:90
+#, python-format
+msgid "Request for baremetal node %s sent to wrong service host"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:143
+msgid "cpu_arch is not found in instance_type_extra_specs"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:185
+#, python-format
+msgid "Baremetal node id not supplied to driver for %r"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:257
+#, python-format
+msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:284
+#, python-format
+msgid "Baremetal power manager failed to restart node for instance %r"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:295
+#, python-format
+msgid "Destroy called on non-existing instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:313
+#, python-format
+msgid "Error from baremetal driver during destroy: %s"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:318
+#, python-format
+msgid "Error while recording destroy failure in baremetal database: %s"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:328
+#, python-format
+msgid "Baremetal power manager failed to stop node for instance %r"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:340
+#, python-format
+msgid "Baremetal power manager failed to start node for instance %r"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:86
+#, python-format
+msgid "pid file %s does not contain any pid"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:109
+msgid "Node id not supplied to IPMI"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:112
+msgid "Address not supplied to IPMI"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:115
+msgid "User not supplied to IPMI"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:118
+msgid "Password not supplied to IPMI"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:135
+#, python-format
+msgid "ipmitool stdout: '%(out)s', stderr: '%(err)s'"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:157
+msgid "IPMI power on failed"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:179
+msgid "IPMI power off failed"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:189
+msgid "IPMI set next bootdev failed"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
+#, python-format
+msgid "Activate node called, but node %s is already active"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:92
+#, python-format
+msgid "Building PXE config for deployment %s."
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:231
+#, python-format
+msgid ""
+"Can not activate PXE bootloader. The following boot parameters were not "
+"passed to baremetal driver: %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:179
+#, python-format
+msgid "Fetching kernel and ramdisk for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:210
+#, python-format
+msgid "Fetching image %(ami)s for instance %(name)s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:246
+#, python-format
+msgid "Injecting files into image for instance %(name)s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:365
+#, python-format
+msgid "Node associated with another instance while waiting for deploy of %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:466
+#, python-format
+msgid "PXE deploy started for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:471
+#, python-format
+msgid "PXE deploy completed for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:475
+#, python-format
+msgid "PXE deploy failed for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:390
+#, python-format
+msgid "Baremetal node deleted while waiting for deployment of instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:482
+#, python-format
+msgid "Timeout reached while waiting for PXE deploy of instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:154
+#, python-format
+msgid ""
+"Can not activate Tilera bootloader. The following boot parameters were "
+"not passed to baremetal driver: %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:371
+#, python-format
+msgid "Tilera deploy started for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:377
+#, python-format
+msgid "Tilera deploy completed for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:385
+msgid "Node is unknown error state."
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:388
+#, python-format
+msgid "Tilera deploy failed for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:83
+msgid "Node id not supplied to PDU"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:86
+msgid "Address not supplied to PDU"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:89
+msgid "User not supplied to PDU"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:92
+msgid "Password not supplied to PDU"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:117
+msgid "PDU failed"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:134
+msgid "PDU power on failed"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:147
+msgid "PDU power off failed"
+msgstr ""
+
+#: nova/virt/baremetal/utils.py:41
+#, python-format
+msgid "Failed to inject data into image %(image)s. Error: %(e)s"
+msgstr ""
+
+#: nova/virt/baremetal/utils.py:52
+#, python-format
+msgid "Failed to unlink %(path)s, error: %(e)s"
+msgstr ""
+
+#: nova/virt/baremetal/utils.py:60
+#, python-format
+msgid "Failed to remove dir %(path)s, error: %(e)s"
+msgstr ""
+
+#: nova/virt/baremetal/utils.py:75
+#, python-format
+msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:37
+#, python-format
+msgid "plug: instance_uuid=%(uuid)s vif=%(vif)s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:50
+#, python-format
+msgid "pif:%(id)s is plugged (vif_uuid=%(vif_uuid)s)"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:57
+#, python-format
+msgid ""
+"Baremetal node: %(id)s has no available physical interface for virtual "
+"interface %(vif_uuid)s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:63
+#, python-format
+msgid "unplug: instance_uuid=%(uuid)s vif=%(vif)s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:71
+#, python-format
+msgid "pif:%(id)s is unplugged (vif_uuid=%(vif_uuid)s)"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:75
+#, python-format
+msgid "no pif for vif_uuid=%s"
+msgstr ""
+
+#: nova/virt/baremetal/virtual_power_driver.py:111
+msgid "virtual_power_ssh_host not defined. Can not Start"
+msgstr ""
+
+#: nova/virt/baremetal/virtual_power_driver.py:115
+msgid "virtual_power_host_user not defined. Can not Start"
+msgstr ""
+
+#: nova/virt/baremetal/virtual_power_driver.py:121
+msgid "virtual_power_host_pass/key not set. Can not Start"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:122
+#, python-format
+msgid "baremetal driver was unable to delete tid %s"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:186
+#, python-format
+msgid "Could not determine iscsi initiator name for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:227
+#, python-format
+msgid "No fixed PXE IP is associated to %s"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:259
+#, python-format
+msgid "detach volume could not find tid for %s"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:199
+msgid "instance_uuid must be supplied to bm_node_associate_and_update"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:211
+#, python-format
+msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:329
+msgid "No more PXE IPs available"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:351
+#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#, python-format
+msgid "Baremetal interface %s not found"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#, python-format
+msgid "Baremetal interface %s already in use"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#, python-format
+msgid "Baremetal virtual interface %s not found"
+msgstr ""
+
+#: nova/virt/disk/api.py:133
+#, python-format
+msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:140
+#, python-format
+msgid "Cannot resize filesystem %s to a smaller size."
+msgstr ""
+
+#: nova/virt/disk/api.py:151
+#, python-format
+msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
+msgstr ""
+
+#: nova/virt/disk/api.py:161
+#, python-format
+msgid ""
+"Unable to determine label for image %(image)s with error %(errror)s. "
+"Cannot resize."
+msgstr ""
+
+#: nova/virt/disk/api.py:228
+msgid "image already mounted"
+msgstr ""
+
+#: nova/virt/disk/api.py:284
+#, python-format
+msgid ""
+"Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:302
+#, python-format
+msgid "Ignoring error injecting data into image (%(e)s)"
+msgstr ""
+
+#: nova/virt/disk/api.py:321
+#, python-format
+msgid ""
+"Failed to mount container filesystem '%(image)s' on '%(target)s': "
+"%(errors)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:338
+#, python-format
+msgid "Failed to teardown ntainer filesystem: %s"
+msgstr ""
+
+#: nova/virt/disk/api.py:351
+#, python-format
+msgid "Failed to umount container filesystem: %s"
+msgstr ""
+
+#: nova/virt/disk/api.py:376
+#, python-format
+msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
+msgstr ""
+
+#: nova/virt/disk/api.py:388
+#, python-format
+msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:397
+#, python-format
+msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:438
+#, python-format
+msgid "Inject key fs=%(fs)s key=%(key)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:466
+#, python-format
+msgid "Inject key fs=%(fs)s net=%(net)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:491
+#, python-format
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
+msgstr ""
+
+#: nova/virt/disk/api.py:535
+msgid "Not implemented on Windows"
+msgstr ""
+
+#: nova/virt/disk/api.py:564
+#, python-format
+msgid "User %(username)s not found in password file."
+msgstr ""
+
+#: nova/virt/disk/api.py:580
+#, python-format
+msgid "User %(username)s not found in shadow file."
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:41
+#, python-format
+msgid ""
+"Instance for format imgfile=%(imgfile)s mountdir=%(mountdir)s "
+"partition=%(partition)s imgfmt=%(imgfmt)s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
+#: nova/virt/disk/vfs/localfs.py:67
+msgid "Using LoopMount"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
+#: nova/virt/disk/vfs/localfs.py:72
+msgid "Using NbdMount"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:57
+#, python-format
+msgid ""
+"Instance for device imgfile=%(imgfile)s mountdir=%(mountdir)s "
+"partition=%(partition)s device=%(device)s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:117
+msgid "Device allocation failed. Will retry in 2 seconds."
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:120
+msgid "Device allocation failed after repeated retries."
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:135
+#, python-format
+msgid "Map dev %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:140
+#, python-format
+msgid "partition search unsupported with %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:156
+#, python-format
+msgid "partition %s not found"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:157
+#, python-format
+msgid "Failed to map partitions: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:179
+#, python-format
+msgid "Unmap dev %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:187
+#, python-format
+msgid "Mount %(dev)s on %(dir)s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:192
+#, python-format
+msgid "Failed to mount filesystem: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:203
+#, python-format
+msgid "Umount %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:214
+msgid "Fail to mount, tearing back down"
+msgstr ""
+
+#: nova/virt/disk/mount/loop.py:33
+#, python-format
+msgid "Could not attach image to loopback: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/loop.py:34
+#, python-format
+msgid "Loop mount error: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/loop.py:40
+#, python-format
+msgid "Got loop device %s"
+msgstr ""
+
+#: nova/virt/disk/mount/loop.py:58
+#, python-format
+msgid "Release loop device %s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:55 nova/virt/disk/mount/nbd.py:69
+msgid "No free nbd devices"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:60
+msgid "nbd module not loaded"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:61
+msgid "nbd unavailable: module not loaded"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:86
+#, python-format
+msgid "Get nbd device %(dev)s for %(imgfile)s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:91
+#, python-format
+msgid "qemu-nbd error: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:92 nova/virt/disk/mount/nbd.py:105
+#, python-format
+msgid "NBD mount error: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:104
+#, python-format
+msgid "nbd device %s did not show up"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:111
+#, python-format
+msgid "Detaching from erroneous nbd device returned error: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:126
+#, python-format
+msgid "Release nbd device %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/api.py:27
+#, python-format
+msgid ""
+"Instance for image imgfile=%(imgfile)s imgfmt=%(imgfmt)s "
+"partition=%(partition)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/api.py:32
+msgid "Trying to import guestfs"
+msgstr ""
+
+#: nova/virt/disk/vfs/api.py:39
+msgid "Using primary VFSGuestFS"
+msgstr ""
+
+#: nova/virt/disk/vfs/api.py:44
+msgid "Falling back to VFSLocalFS"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:55
+#, python-format
+msgid "Mount guest OS image %(imgfile)s partition %(part)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:64
+#, python-format
+msgid "Inspecting guest OS image %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:68
+#, python-format
+msgid "No operating system found in %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:72
+#, python-format
+msgid "Multi-boot OS %(roots)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:74
+#, python-format
+msgid "Multi-boot operating system found in %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:80
+#, python-format
+msgid "Inspecting guest OS root filesystem %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:85
+#, python-format
+msgid "No mount points found in %(root)s of %(imgfile)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:90
+#, python-format
+msgid "Mounting %(dev)s at %(dir)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:95
+#, python-format
+msgid "Setting up appliance for %(imgfile)s %(imgfmt)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:113
+#, python-format
+msgid "Error mounting %(imgfile)s with libguestfs (%(e)s)"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:120
+msgid "Tearing down appliance"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:126
+#, python-format
+msgid "Failed to close augeas %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:134
+#, python-format
+msgid "Failed to shutdown appliance %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:142
+#, python-format
+msgid "Failed to close guest handle %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:154 nova/virt/disk/vfs/localfs.py:102
+#, python-format
+msgid "Make directory path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:159 nova/virt/disk/vfs/localfs.py:107
+#, python-format
+msgid "Append file path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:164 nova/virt/disk/vfs/localfs.py:116
+#, python-format
+msgid "Replace file path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:169 nova/virt/disk/vfs/localfs.py:125
+#, python-format
+msgid "Read file path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:174 nova/virt/disk/vfs/localfs.py:131
+#, python-format
+msgid "Has file path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:183
+#, python-format
+msgid "Set permissions path=%(path)s mode=%(mode)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:188
+#, python-format
+msgid "Set ownership path=%(path)s user=%(user)s group=%(group)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:201
+#, python-format
+msgid "chown uid=%(uid)d gid=%(gid)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:46
+#, python-format
+msgid "File path %s not valid"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:80
+#, python-format
+msgid "Failed to mount image %(ex)s)"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:90
+#, python-format
+msgid "Failed to unmount %(imgdir)s: %(ex)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:96
+#, python-format
+msgid "Failed to remove %(imgdir)s: %(ex)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:139
+#, python-format
+msgid "Set permissions path=%(path)s mode=%(mode)o"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:144
+#, python-format
+msgid "Set permissions path=%(path)s user=%(user)s group=%(group)s"
+msgstr ""
+
+#: nova/virt/hyperv/basevolumeutils.py:71
+msgid "The ISCSI initiator name can't be found. Choosing the default one"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:150
+msgid "plug_vifs called"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:153
+msgid "unplug_vifs called"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:156
+msgid "ensure_filtering_rules_for_instance called"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:160
+msgid "unfilter_instance called"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:191
+msgid "get_console_output called"
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:93
+#, python-format
+msgid "Windows version: %s "
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:105
+msgid "get_available_resource called"
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
+#: nova/virt/xenapi/host.py:148
+msgid "Updating host stats"
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:159
+msgid "get_host_stats called"
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:174
+#, python-format
+msgid "Host IP address is: %s"
+msgstr ""
+
+#: nova/virt/hyperv/imagecache.py:49
+#, python-format
+msgid "The image is not a valid VHD: %s"
+msgstr ""
+
+#: nova/virt/hyperv/imagecache.py:69
+#, python-format
+msgid ""
+"Cannot resize the image to a size smaller than the VHD max. internal "
+"size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
+msgstr ""
+
+#: nova/virt/hyperv/imagecache.py:84
+#, python-format
+msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/imagecache.py:87
+#, python-format
+msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:45
+msgid "live_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:55
+#, python-format
+msgid "Calling live migration recover_method for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:59
+#, python-format
+msgid "Calling live migration post_method for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:65
+msgid "pre_live_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:78
+msgid "post_live_migration_at_destination called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:85
+msgid "check_can_live_migrate_destination called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:90
+msgid "check_can_live_migrate_destination_cleanup called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:94
+msgid "check_can_live_migrate_source called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:43
+#, python-format
+msgid "Live migration is not supported on target host \"%s\""
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:46
+#, python-format
+msgid "Target live migration host \"%s\" is unreachable"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:49
+#, python-format
+msgid "Live migration failed: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:61
+msgid "Live migration is not enabled on this host"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:64
+msgid "Live migration networks are not configured on this host"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:70 nova/virt/hyperv/vmutils.py:103
+#, python-format
+msgid "VM not found: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:72 nova/virt/hyperv/vmutils.py:112
+#, python-format
+msgid "Duplicate VM name found: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:77
+#, python-format
+msgid "Destroying existing remote planned VM: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:99
+#, python-format
+msgid "Creating remote planned VM for VM: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:156
+#, python-format
+msgid ""
+"Replacing host resource %(old_disk_path)s with %(new_disk_path)s on "
+"planned VM %(vm_name)s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:163
+#, python-format
+msgid "Updating remote planned VM disk paths for VM: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:199
+#, python-format
+msgid "Starting live migration for VM: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:208
+#, python-format
+msgid "Getting live migration networks for remote host: %s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:50
+msgid "Migration target is the source host"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:52
+#, python-format
+msgid "Migration target host: %s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:73
+#, python-format
+msgid "Copying disk \"%(disk_file)s\" to \"%(dest_path)s\""
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:96
+msgid "Cannot cleanup migration files"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:103
+#, python-format
+msgid ""
+"Cannot resize the root disk to a smaller size. Current size: "
+"%(curr_root_gb)s GB. Requested size: %(new_root_gb)s GB"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:113
+msgid "migrate_disk_and_power_off called"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:133
+msgid "confirm_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:148
+msgid "finish_revert_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:166
+#, python-format
+msgid "Copying base disk %(base_vhd_path)s to %(base_vhd_copy_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:170
+#, python-format
+msgid ""
+"Reconnecting copied base VHD %(base_vhd_copy_path)s and diff VHD "
+"%(diff_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:176
+#, python-format
+msgid "Merging base disk %(base_vhd_copy_path)s and diff disk %(diff_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:188
+#, python-format
+msgid "Getting info for disk: %s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:193
+#, python-format
+msgid "Resizing disk \"%(vhd_path)s\" to new max size %(new_size)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:204
+#, python-format
+msgid ""
+"Reconnecting copied base VHD %(base_vhd_path)s and diff VHD "
+"%(diff_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:213
+msgid "finish_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:222
+#, python-format
+msgid "Cannot find boot VHD file: %s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:235 nova/virt/hyperv/vmops.py:136
+msgid "Cannot resize a VHD to a smaller size"
+msgstr ""
+
+#: nova/virt/hyperv/networkutils.py:46
+#, python-format
+msgid "vswitch \"%s\" not found"
+msgstr ""
+
+#: nova/virt/hyperv/networkutils.py:59
+#, python-format
+msgid "Failed to create vswitch port %(port_name)s on switch %(vswitch_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/pathutils.py:71
+#, python-format
+msgid "The file copy from %(src)s to %(dest)s failed"
+msgstr ""
+
+#: nova/virt/hyperv/pathutils.py:92
+#, python-format
+msgid "Creating directory: %s"
+msgstr ""
+
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
+#, python-format
+msgid "Removing directory: %s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:56
+#, python-format
+msgid "Creating snapshot for instance %s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:65
+#, python-format
+msgid "Getting info for VHD %s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:73
+#, python-format
+msgid "Copying VHD %(src_vhd_path)s to %(dest_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:83
+#, python-format
+msgid "Copying base disk %(src_vhd_path)s to %(dest_base_disk_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:88
+#, python-format
+msgid ""
+"Reconnecting copied base VHD %(dest_base_disk_path)s and diff VHD "
+"%(dest_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:94
+#, python-format
+msgid "Merging base disk %(dest_base_disk_path)s and diff disk %(dest_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:99
+#, python-format
+msgid ""
+"Updating Glance image %(image_id)s with content from merged disk "
+"%(image_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:105
+#, python-format
+msgid "Snapshot image %(image_id)s updated for VM %(instance_name)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:109
+#, python-format
+msgid "Removing snapshot %s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:113
+#, python-format
+msgid "Failed to remove snapshot for VM %s"
+msgstr ""
+
+#: nova/virt/hyperv/vif.py:75
+#, python-format
+msgid "Creating vswitch port for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:91
+#, python-format
+msgid "VIF driver not found for network_api_class: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:100
+msgid "get_info called for instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:121
+#, python-format
+msgid ""
+"Creating differencing VHD. Parent: %(base_vhd_path)s, Target: "
+"%(root_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:127
+#, python-format
+msgid "Copying VHD image %(base_vhd_path)s to target: %(root_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:139
+#, python-format
+msgid "Resizing VHD %(root_vhd_path)s to new size %(root_vhd_size)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:152
+msgid "Spawning new instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:178
+msgid "Spawn instance failed"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:203
+#, python-format
+msgid "Creating nic for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:211
+#, python-format
+msgid "Invalid config_drive_format \"%s\""
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:214
+#, python-format
+msgid "Using config drive for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
+#, python-format
+msgid "Creating config drive at %(path)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
+#, python-format
+msgid "Creating config drive failed with error: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:271
+#, python-format
+msgid "Got request to destroy instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:284
+#, python-format
+msgid "Instance not found: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:290
+#, python-format
+msgid "Failed to destroy instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:295
+msgid "reboot instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:301
+msgid "Pause instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:307
+msgid "Unpause instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:313
+msgid "Suspend instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:319
+msgid "Resume instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:325
+msgid "Power off instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:331
+msgid "Power on instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:338
+#, python-format
+msgid "Successfully changed state of VM %(vm_name)s to: %(req_state)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:342
+#, python-format
+msgid "Failed to change vm state of %(vm_name)s to %(req_state)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:83
+#, python-format
+msgid "Cannot get VM summary data for: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:160
+#, python-format
+msgid "Creating VM %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:169
+#, python-format
+msgid "Setting memory for vm %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:172
+#, python-format
+msgid "Set vCPUs for vm %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:270
+msgid "Controller not found"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:332
+#, python-format
+msgid "Successfully changed vm state of %(vm_name)s to %(req_state)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:373
+#, python-format
+msgid "Operation failed with return value: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:391
+#, python-format
+msgid ""
+"WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
+" - %(err_desc)s - Error code: %(err_code)d"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:399
+#, python-format
+msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:403
+#, python-format
+msgid "WMI job failed with status %(job_state)d. No error description available"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:409
+#, python-format
+msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:98
+#, python-format
+msgid ""
+"Already logged in on storage target. No need to login. Portal: "
+"%(target_portal)s, IQN: %(target_iqn)s, LUN: %(target_lun)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:102
+#, python-format
+msgid ""
+"Logging in on storage target. Portal: %(target_portal)s, IQN: "
+"%(target_iqn)s, LUN: %(target_lun)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:115
+#, python-format
+msgid "Attach_volume: %(connection_info)s to %(instance_name)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:145
+#, python-format
+msgid "Attach volume failed: %s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:147
+#, python-format
+msgid "Unable to attach volume to instance %s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:160
+#, python-format
+msgid "Logging off storage target %(target_iqn)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:165
+#, python-format
+msgid "Detach_volume: %(connection_info)s from %(instance_name)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:176
+#, python-format
+msgid "Detaching physical disk from instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
+msgid "Could not determine iscsi initiator name"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:198 nova/virt/hyperv/volumeops.py:211
+#, python-format
+msgid "Unable to find a mounted disk for target_iqn: %s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:200
+#, python-format
+msgid "Device number: %(device_number)s, target lun: %(target_lun)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeutils.py:51
+#, python-format
+msgid "An error has occurred when calling the iscsi initiator: %s"
+msgstr ""
+
+#: nova/virt/libvirt/blockinfo.py:127
+#, python-format
+msgid "Unable to determine disk prefix for %s"
+msgstr ""
+
+#: nova/virt/libvirt/blockinfo.py:174
+#, python-format
+msgid "No free disk device names for prefix '%s'"
+msgstr ""
+
+#: nova/virt/libvirt/blockinfo.py:264
+#, python-format
+msgid "Unable to determine disk bus for '%s'"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:346
+#, python-format
+msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:552
+#, python-format
+msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:560
+#, python-format
+msgid "Connecting to libvirt: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:577
+#, python-format
+msgid "URI %s does not support events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:593
+msgid "Connection to libvirt broke"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:615 nova/virt/libvirt/driver.py:618
+#, python-format
+msgid "Can not handle authentication request for %d credentials"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:636
+#, python-format
+msgid "Connection to libvirt failed: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:728
+#, python-format
+msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:743
+msgid "During wait destroy, instance disappeared."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:748
+msgid "Instance destroyed successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:758
+msgid "Instance may be started again."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:768
+msgid "Going to destroy instance again."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:787
+msgid "Error from libvirt during undefineFlags. Retrying with undefine"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:803
+#, python-format
+msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:823
+msgid "Instance may be still running, destroy it again."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:829
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:857
+#, python-format
+msgid "Deleting instance files %(target)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:866
+#, python-format
+msgid "Failed to cleanup directory %(target)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:909
+msgid "Could not determine fibre channel world wide node names"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:916
+msgid "Could not determine fibre channel world wide port names"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:921
+msgid "No Volume Connector found."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1043
+msgid "During detach_volume, instance disappeared."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1067
+msgid "attaching network adapter failed."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1087
+msgid "During detach_interface, instance disappeared."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1091
+msgid "detaching network adapter failed."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1177
+msgid "Beginning live snapshot process"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1180
+msgid "Beginning cold snapshot process"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1209
+msgid "Snapshot extracted, beginning image upload"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1221
+msgid "Snapshot image upload complete"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1294
+msgid "Instance soft rebooted successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1298
+msgid "Failed to soft reboot instance."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1333
+msgid "Instance shutdown successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1341
+msgid "Instance may have been rebooted during soft reboot, so return now."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1389
+msgid "Instance rebooted successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1535
+msgid "Instance is running"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
+msgid "Instance spawned successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1558
+#, python-format
+msgid "data: %(data)r, fpath: %(fpath)r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
+#, python-format
+msgid "Truncated console log returned, %d bytes ignored"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1610
+msgid "Guest does not have a console available"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1679
+#, python-format
+msgid "Path '%(path)s' supports direct I/O"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1683
+#, python-format
+msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
+#, python-format
+msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1764
+msgid "Creating image"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1865
+msgid "Using config drive"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1914
+#, python-format
+msgid "Injecting %(inj)s into image %(img_id)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1924
+#, python-format
+msgid "Error injecting data into image %(img_id)s (%(e)s)"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1981
+#, python-format
+msgid ""
+"Config requested an explicit CPU model, but the current libvirt "
+"hypervisor '%s' does not support selecting CPU models"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1987
+msgid "Config requested a custom CPU model, but no model name was provided"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1991
+msgid "A CPU model name should not be set when a host CPU model is requested"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1995
+#, python-format
+msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2011
+msgid ""
+"Passthrough of the host CPU was requested but this libvirt version does "
+"not support this feature"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2335
+#, python-format
+msgid ""
+"Start to_xml instance=%(instance)s network_info=%(network_info)s "
+"disk_info=%(disk_info)s image_meta=%(image_meta)s "
+"rescue=%(rescue)sblock_device_info=%(block_device_info)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2350
+#, python-format
+msgid "End to_xml instance=%(instance)s xml=%(xml)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2367
+#, python-format
+msgid ""
+"Error from libvirt while looking up %(instance_name)s: [Error Code "
+"%(error_code)s] %(ex)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
+#, python-format
+msgid "Invalid range expression %r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2558
+#, python-format
+msgid "Invalid exclusion expression %r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2565
+#, python-format
+msgid "Invalid inclusion expression %r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2570
+#, python-format
+msgid "No CPUs available after parsing %r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2587
+msgid ""
+"Cannot get the number of cpu, because this function is not implemented "
+"for this platform. "
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2597
+msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2649
+#, python-format
+msgid "couldn't obtain the vpu count from domain id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2655
+#, python-format
+msgid "List of domains returned by libVirt: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2657
+#, python-format
+msgid "libVirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2721
+msgid "libvirt version is too old (does not support getVersion)"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2805
+#, python-format
+msgid "Trying to get stats for the volume %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2818
+#, python-format
+msgid ""
+"Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
+"rd_req=%(rd_req)d, rd_bytes=%(rd_bytes)d, wr_req=%(wr_req)d, "
+"wr_bytes=%(wr_bytes)d"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2836
+#, python-format
+msgid ""
+"Getting block stats failed, device might have been detached. "
+"Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2841
+#, python-format
+msgid ""
+"Could not find domain in libvirt for instance %s. Cannot get block stats "
+"for device"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2918
+#, python-format
+msgid ""
+"Creating tmpfile %s to verify with other compute node that the instance "
+"is on the same shared storage."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3000
+msgid "Block migration can not be used with shared storage."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3008
+msgid "Live migration can not be used without shared storage."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3045
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s: Disk of instance is too "
+"large(available on destination host:%(available)s < need:%(necessary)s)"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3070
+#, python-format
+msgid ""
+"Instance launched has CPU info:\n"
+"%s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3082
+#, python-format
+msgid ""
+"CPU doesn't have compatibility.\n"
+"\n"
+"%(ret)s\n"
+"\n"
+"Refer to %(u)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3099
+#, python-format
+msgid ""
+"Creating tmpfile %s to notify to other compute nodes that they should "
+"mount the same storage."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3147
+#, python-format
+msgid "The firewall filter for %s does not exist"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3219
+#, python-format
+msgid "Live Migration failure: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3312
+#, python-format
+msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3424
+#, python-format
+msgid ""
+"Error from libvirt while getting description of %(instance_name)s: [Error"
+" Code %(error_code)s] %(ex)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3441
+#, python-format
+msgid "skipping %(path)s since it looks like volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3446
+#, python-format
+msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3487
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3556
+msgid "Starting migrate_disk_and_power_off"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3617
+msgid "Instance running successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3623
+msgid "Starting finish_migration"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3685
+msgid "Starting finish_revert_migration"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3806
+#, python-format
+msgid "Checking instance files accessability%(instance_path)s"
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:51
+msgid ""
+"Libvirt module could not be loaded. NWFilterFirewall will not work "
+"correctly."
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:107
+msgid "Called setup_basic_filtering in nwfilter"
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:115
+msgid "Ensuring static filters"
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:247
+#, python-format
+msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:270
+#, python-format
+msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:286
+msgid "iptables firewall: Setup Basic Filtering"
+msgstr ""
+
+#: nova/virt/libvirt/imagebackend.py:294
+msgid "You should specify libvirt_images_volume_group flag to use LVM images."
+msgstr ""
+
+#: nova/virt/libvirt/imagebackend.py:378
+#, python-format
+msgid "Unknown image_type=%s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:139
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:178
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:200
+#, python-format
+msgid "Writing stored info to %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:329
+#, python-format
+msgid "%s is a valid instance name"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:332
+#, python-format
+msgid "%s has a disk file"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:334
+#, python-format
+msgid "Instance %(instance)s is backed by %(backing)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:347
+#, python-format
+msgid ""
+"Instance %(instance)s is using a backing file %(backing)s which does not "
+"appear in the image service"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:422
+#, python-format
+msgid "image %(id)s at (%(base_file)s): image verification failed"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:432
+#, python-format
+msgid ""
+"image %(id)s at (%(base_file)s): image verification skipped, no hash "
+"stored"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:441
+#, python-format
+msgid "%(id)s (%(base_file)s): generating checksum"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:456
+#, python-format
+msgid "Cannot remove %(base_file)s, it does not exist"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:468
+#, python-format
+msgid "Base file too young to remove: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:471
+#, python-format
+msgid "Removing base file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:478
+#, python-format
+msgid "Failed to remove %(base_file)s, error was %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:489
+#, python-format
+msgid "image %(id)s at (%(base_file)s): checking"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:513
+#, python-format
+msgid ""
+"image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
+"%(remote)d on other nodes sharing this instance storage"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:525
+#, python-format
+msgid ""
+"image %(id)s at (%(base_file)s): warning -- an absent base file is in "
+"use! instances: %(instance_list)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:537
+#, python-format
+msgid "image %(id)s at (%(base_file)s): image is not in use"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:544
+#, python-format
+msgid "image %(id)s at (%(base_file)s): image is in use"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:568
+#, python-format
+msgid "Skipping verification, no base directory at %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:572
+msgid "Verify base images"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:579
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:597
+#, python-format
+msgid "Unknown base file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:602
+#, python-format
+msgid "Active base files: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:605
+#, python-format
+msgid "Corrupt base files: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:609
+#, python-format
+msgid "Removable base files: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:617
+msgid "Verification complete"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:72 nova/virt/libvirt/utils.py:78
+msgid "systool is not installed"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:82
+msgid "Cannot find any Fibre Channel HBAs"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:224
+#, python-format
+msgid ""
+"Insufficient Space on Volume Group %(vg)s. Only %(free_space)db "
+"available, but %(size)db required by volume %(lv)s."
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:233
+#, python-format
+msgid ""
+"Volume group %(vg)s will not be able to hold sparse volume %(lv)s. "
+"Virtual volume size is %(size)db, but free space on volume group is only "
+"%(free_space)db."
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:264
+#, python-format
+msgid "vg %s must be LVM volume group"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:293
+#, python-format
+msgid "Path %s must be LVM logical volume"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:558
+msgid "Can't retrieve root device path from instance libvirt configuration"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
+#: nova/virt/libvirt/vif.py:473
+#, python-format
+msgid ""
+"vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
+"mapping=%(mapping)s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
+#: nova/virt/libvirt/vif.py:479
+msgid "vif_type parameter must be present for this vif_driver implementation"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
+#: nova/virt/libvirt/vif.py:492
+#, python-format
+msgid "Unexpected vif_type=%s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:304
+#, python-format
+msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:314
+#, python-format
+msgid "Ensuring bridge %s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+msgid "Failed while unplugging vif"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:501
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:527
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:555
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:583
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:609
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:238
+#, python-format
+msgid "iSCSI device not found at %s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:241
+#, python-format
+msgid ""
+"ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
+"number: %(tries)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:253
+#, python-format
+msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
+#, python-format
+msgid "%s is already mounted"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:563
+#, python-format
+msgid "AoE device not found at %s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:565
+#, python-format
+msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:579
+#, python-format
+msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:707
+msgid "We are unable to locate any Fibre Channel devices"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:716
+#, python-format
+msgid "Looking for Fibre Channel dev %(device)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:726
+msgid "Fibre Channel device not found."
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:729
+#, python-format
+msgid ""
+"Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
+"Try number: %(tries)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:745
+#, python-format
+msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:752
+#, python-format
+msgid "Multipath device discovered %(device)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:818
+msgid "Value required for 'scality_sofs_config'"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:829
+#, python-format
+msgid "Cannot access 'scality_sofs_config': %s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:835
+msgid "Cannot execute /sbin/mount.sofs"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:850
+msgid "Cannot mount Scality SOFS, check syslog for errors"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:149
+#, python-format
+msgid "Removing the logical volume '%s'"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:167
+#, python-format
+msgid "Fetching image '%s' from glance"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:172
+#, python-format
+msgid "Using image found at '%s'"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:174
+#, python-format
+msgid "Ensuring image '%s' exists on IVM"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:185
+#, python-format
+msgid "Creating logical volume of size %s bytes"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:188
+#, python-format
+msgid "Copying image to the device '%s'"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:191
+msgid "Error while creating logical volume from image. Will attempt cleanup."
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:198
+msgid "Error while attempting cleanup of failed deploy to logical volume."
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:244
+msgid "Snapshot added to glance."
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:250
+#, python-format
+msgid "Failed to clean up snapshot file %(snapshot_file_path)s"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:335
+msgid "Could not create logical volume. No space left on any volume group."
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:426 nova/virt/powervm/blockdev.py:498
+msgid "Unable to get checksum"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:429 nova/virt/powervm/blockdev.py:521
+msgid "Image checksums do not match"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:450
+#, python-format
+msgid "Image found on host at '%s'"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:458
+msgid "Uncompressed image file not found"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
+#, python-format
+msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
+#, python-format
+msgid "Found error stream for command \"%(command)s\": %(error_text)s"
+msgstr ""
+
+#: nova/virt/powervm/common.py:67
+msgid "Connection error connecting PowerVM manager"
+msgstr ""
+
+#: nova/virt/powervm/common.py:100
+#, python-format
+msgid "Running cmd (SSH-as-root): %s"
+msgstr ""
+
+#: nova/virt/powervm/common.py:149
+msgid "File transfer to PowerVM manager failed"
+msgstr ""
+
+#: nova/virt/powervm/common.py:168
+#, python-format
+msgid "ftp GET %(remote_path)s to: %(local_path)s"
+msgstr ""
+
+#: nova/virt/powervm/common.py:174
+msgid "File transfer from PowerVM manager failed"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:124
+msgid "In get_host_ip_addr"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:127
+#, python-format
+msgid "Attempting to resolve %s"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:129
+#, python-format
+msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:174
+#, python-format
+msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:305
+#, python-format
+msgid "Unrecognized root disk information: %s"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:21
+msgid "Connection to PowerVM manager failed"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:25
+#, python-format
+msgid "File '%(file_path)s' transfer to PowerVM manager failed"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:29
+#, python-format
+msgid "FTP %(ftp_cmd)s from %(source_path)s to %(dest_path)s failed"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:33
+#, python-format
+msgid "LPAR instance '%(instance_name)s' could not be found"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:37
+#, python-format
+msgid "LPAR instance '%(instance_name)s' creation failed"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:41
+msgid "No space left on any volume group"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:49
+#, python-format
+msgid "Operation '%(operation)s' on LPAR '%(instance_name)s' timed out"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:54
+msgid "Image creation failed on PowerVM"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:58
+#, python-format
+msgid ""
+"Insufficient free memory on PowerVM system to spawn instance "
+"'%(instance_name)s'"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:63
+#, python-format
+msgid ""
+"Insufficient available CPUs on PowerVM system to spawn instance "
+"'%(instance_name)s'"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:68
+#, python-format
+msgid "PowerVM LPAR instance '%(instance_name)s' cleanup failed"
+msgstr ""
+
+#: nova/virt/powervm/lpar.py:55
+#, python-format
+msgid ""
+"Encountered unknown LPAR attribute: %s\n"
+"Continuing without storing"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:98
+#, python-format
+msgid "LPAR instance '%s' not found"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:186
+#, python-format
+msgid "PowerVM image creation failed: %s"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:200
+#, python-format
+msgid "Creating LPAR instance '%s'"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:202
+#, python-format
+msgid "LPAR instance '%s' creation failed"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:208
+#, python-format
+msgid "Activating the LPAR instance '%s'"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:225
+#, python-format
+msgid "Instance '%s' failed to boot"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:237
+msgid "Error while attempting to clean up failed instance launch."
+msgstr ""
+
+#: nova/virt/powervm/operator.py:241
+#, python-format
+msgid "Instance spawned in %s seconds"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:252
+#, python-format
+msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
+msgstr ""
+
+#: nova/virt/powervm/operator.py:271
+#, python-format
+msgid "Stopping instance %s for snapshot."
+msgstr ""
+
+#: nova/virt/powervm/operator.py:294
+#, python-format
+msgid "Shutting down the instance '%s'"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:299
+#, python-format
+msgid "Deleting the LPAR instance '%s'"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:311
+msgid "PowerVM instance cleanup failed"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
+msgid "Not enough free memory in the host"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
+msgid "Insufficient available CPU on PowerVM"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:138
+msgid ""
+"Must specify vmwareapi_host_ip,vmwareapi_host_username and "
+"vmwareapi_host_password to usecompute_driver=vmwareapi.VMwareESXDriver or"
+" vmwareapi.VMwareVCDriver"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:355
+#, python-format
+msgid "VMware Cluster %s is not found"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:456
+#, python-format
+msgid "In vmwareapi:_create_session, got this exception: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:539
+#, python-format
+msgid "In vmwareapi:_call_method, got this exception: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:575
+#, python-format
+msgid "Task [%(task_name)s] %(task_ref)s status: success"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:580
+#, python-format
+msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:584
+#, python-format
+msgid "In vmwareapi:_poll_task, Got this error %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:93
+#, python-format
+msgid "Error(s) %s occurred in the call to RetrieveProperties"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#, python-format
+msgid "%(text)s: _db_content => %(content)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:132
+#, python-format
+msgid "Property %(attr)s not set for the managed object %(name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:492
+msgid "There is no VM registered"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#, python-format
+msgid "Virtual Machine with ref %s is not there"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:557
+#, python-format
+msgid "Logging out a session that is invalid or already logged out: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:572
+msgid "Session is faulty"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:575
+msgid "Session Invalid"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:666
+msgid "No Virtual Machine has been registered yet"
+msgstr ""
+
+#: nova/virt/vmwareapi/host.py:40
+#, python-format
+msgid "%(action)s %(host)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/host.py:63
+#, python-format
+msgid "Set maintenance mod on %(host)s to %(mode)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/io_util.py:112
+#, python-format
+msgid "Glance image %s is in killed state"
+msgstr ""
+
+#: nova/virt/vmwareapi/io_util.py:120
+#, python-format
+msgid "Glance image %(image_id)s is in unknown state - %(state)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/network_util.py:138
+msgid ""
+"ESX SOAP server returned an empty port group for the host system in its "
+"response"
+msgstr ""
+
+#: nova/virt/vmwareapi/network_util.py:164
+#, python-format
+msgid "Creating Port Group with name %s on the ESX host"
+msgstr ""
+
+#: nova/virt/vmwareapi/network_util.py:178
+#, python-format
+msgid "Created Port Group with name %s on the ESX host"
+msgstr ""
+
+#: nova/virt/vmwareapi/read_write_util.py:142
+#, python-format
+msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:84
+msgid "Unable to import suds."
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:169
+#, python-format
+msgid "No such SOAP method '%s' provided by VI SDK"
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:174
+#, python-format
+msgid "httplib error in %s: "
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:181
+#, python-format
+msgid "Socket error in %s: "
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:186
+#, python-format
+msgid "Type error in  %s: "
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:190
+#, python-format
+msgid "Exception in %s "
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:92
+msgid "Getting list of instances"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:108
+#, python-format
+msgid "Got total of %s instances"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:198
+msgid "Creating VM on the ESX host"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:206
+msgid "Created VM on the ESX host"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:230
+#, python-format
+msgid ""
+"Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
+"type %(adapter_type)s on the ESX host local store %(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:249
+#, python-format
+msgid ""
+"Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
+"%(disk_type)s on the ESX host local store %(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:258
+#, python-format
+msgid ""
+"Deleting the file %(vmdk_path)s on the ESX host localstore "
+"%(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:272
+#, python-format
+msgid ""
+"Deleted the file %(vmdk_path)s on the ESX host local store "
+"%(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:280
+#, python-format
+msgid ""
+"Downloading image file data %(image_ref)s to the ESX data store "
+"%(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:300
+#, python-format
+msgid ""
+"Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
+"ESX data store %(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:314
+#, python-format
+msgid ""
+"Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
+" %(adapter_type)s on the ESX host local store %(data_store_name)s to disk"
+" type %(disk_type)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:335
+#, python-format
+msgid ""
+"Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
+"%(disk_type)s on the ESX host local store %(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:414
+msgid "Powering on the VM instance"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:420
+msgid "Powered on the VM instance"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:466
+msgid "Creating Snapshot of the VM instance"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:476
+msgid "Created Snapshot of the VM instance"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:521
+msgid "Copying disk data before snapshot of the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:534
+msgid "Copied disk data before snapshot of the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:543
+#, python-format
+msgid "Uploading image %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:557
+#, python-format
+msgid "Uploaded image %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:570
+#, python-format
+msgid "Deleting temporary vmdk file %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:579
+#, python-format
+msgid "Deleted temporary vmdk file %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:611
+msgid "instance is not powered on"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:618
+msgid "Rebooting guest OS of VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:621
+msgid "Rebooted guest OS of VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:623
+msgid "Doing hard reboot of VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:627
+msgid "Did hard reboot of VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
+#: nova/virt/vmwareapi/vmops.py:964
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+msgid "Destroying the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+msgid "Destroyed the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:652
+#, python-format
+msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+msgid "Powering off the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+msgid "Powered off the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:699
+msgid "Unregistering the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:702
+msgid "Unregistered the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:704
+#, python-format
+msgid ""
+"In vmwareapi:vmops:destroy, got this exception while un-registering the "
+"VM: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:717
+#, python-format
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:729
+#, python-format
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:734
+#, python-format
+msgid ""
+"In vmwareapi:vmops:destroy, got this exception while deleting the VM "
+"contents from the disk: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:742
+msgid "pause not supported for vmwareapi"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:746
+msgid "unpause not supported for vmwareapi"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:760
+msgid "Suspending the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:764
+msgid "Suspended the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:767
+msgid "instance is powered off and cannot be suspended."
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:770
+msgid "VM was already in suspended state. So returning without doing anything"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:783
+msgid "Resuming the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:788
+msgid "Resumed the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:790
+msgid "instance is not in a suspended state"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:851
+msgid "instance is suspended and cannot be powered off."
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:854
+msgid "VM was already in powered off state. So returning without doing anything"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:867
+msgid "VM was already in powered on state. So returning without doing anything"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:871
+msgid "Powering on the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:876
+msgid "Powered on the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:893
+#, python-format
+msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:924
+#, python-format
+msgid "Renaming the VM to %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:930
+#, python-format
+msgid "Renamed the VM to %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:945
+#, python-format
+msgid "Cloning VM to host %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:953
+#, python-format
+msgid "Cloned VM to host %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:975
+#, python-format
+msgid ""
+"In vmwareapi:vmops:confirm_migration, got this exception while destroying"
+" the VM: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:990
+#, python-format
+msgid "Renaming the VM from %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:996
+#, python-format
+msgid "Renamed the VM from %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1019
+#, python-format
+msgid "Migrating VM to host %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1031
+#, python-format
+msgid "Migrated VM to host %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
+#, python-format
+msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1045
+#, python-format
+msgid "Automatically hard rebooting %d"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1081
+msgid "get_diagnostics not implemented for vmwareapi"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1163
+msgid "Reconfiguring VM instance to set the machine id"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1169
+msgid "Reconfigured VM instance to set the machine id"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1183
+#, python-format
+msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1190
+#, python-format
+msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1283
+#, python-format
+msgid "Creating directory with path %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1289
+#, python-format
+msgid "Created directory with path %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:91
+#, python-format
+msgid "Downloading image %s from glance image server"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:107
+#, python-format
+msgid "Downloaded image %s from glance image server"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:113
+#, python-format
+msgid "Uploading image %s to the Glance image server"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:139
+#, python-format
+msgid "Uploaded image %s to the Glance image server"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:150
+#, python-format
+msgid "Getting image size for the image %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:155
+#, python-format
+msgid "Got image size of %(size)s for the image %(image)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volume_util.py:163
+#, python-format
+msgid "Rescanning HBA %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volume_util.py:166
+#, python-format
+msgid "Rescanned HBA %s "
+msgstr ""
+
+#: nova/virt/vmwareapi/volume_util.py:178 nova/virt/xenapi/volume_utils.py:267
+#, python-format
+msgid "Mountpoint cannot be translated: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:57
+#, python-format
+msgid ""
+"Reconfiguring VM instance %(instance_name)s to attach disk %(vmdk_path)s "
+"or device %(device_name)s with type %(disk_type)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:65
+#, python-format
+msgid ""
+"Reconfigured VM instance %(instance_name)s to attach disk %(vmdk_path)s "
+"or device %(device_name)s with type %(disk_type)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:77
+#, python-format
+msgid "Reconfiguring VM instance %(instance_name)s to detach disk %(disk_key)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:84
+#, python-format
+msgid "Reconfigured VM instance %(instance_name)s to detach disk %(disk_key)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:91
+#, python-format
+msgid "Discovering iSCSI target %(target_iqn)s from %(target_portal)s."
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:96
+msgid "Storage target found. No need to discover"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:104
+#, python-format
+msgid "Discovered iSCSI target %(target_iqn)s from %(target_portal)s."
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:107
+#, python-format
+msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#, python-format
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:138 nova/virt/vmwareapi/volumeops.py:177
+msgid "Unable to find iSCSI Target"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#, python-format
+msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#, python-format
+msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:185
+msgid "Unable to find volume"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#, python-format
+msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
+#, python-format
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
+#, python-format
+msgid ""
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
+#, python-format
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:107
+#, python-format
+msgid ""
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:117
+#, python-format
+msgid "Failed to query agent version: %(resp)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:136
+msgid "Querying agent version"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:150
+msgid "Reached maximum time attempting to query agent version"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:158
+#, python-format
+msgid "Updating agent to %s"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:166
+#, python-format
+msgid "Failed to update agent: %(resp)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:180
+msgid "Setting admin password"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:191
+#, python-format
+msgid "Failed to exchange keys: %(resp)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:211
+#, python-format
+msgid "Failed to update password: %(resp)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:232
+msgid "Skipping setting of ssh key for Windows."
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:247
+#, python-format
+msgid "Injecting file path: %r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+#, python-format
+msgid "Failed to inject file: %(resp)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:267
+msgid "Resetting network"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:273
+#, python-format
+msgid "Failed to reset network: %(resp)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:296
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:304
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:308
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:360
+#, python-format
+msgid "OpenSSL error: %s"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:134
+msgid ""
+"Must specify xenapi_connection_url, xenapi_connection_username "
+"(optionally), and xenapi_connection_password to use "
+"compute_driver=xenapi.XenAPIDriver"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:161
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:345
+#, python-format
+msgid "Could not determine key: %s"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:561
+msgid "Host startup on XenServer is not supported."
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:621
+msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:661
+msgid "Host is member of a pool, but DB says otherwise"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
+#, python-format
+msgid "Got exception: %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
+#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+msgid "Raising NotImplemented"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:689
+#, python-format
+msgid "xenapi.fake does not have an implementation for %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:723
+#, python-format
+msgid "Calling %(localname)s %(impl)s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:728
+#, python-format
+msgid "Calling getter %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:731
+#, python-format
+msgid "Calling setter %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:793
+#, python-format
+msgid ""
+"xenapi.fake does not have an implementation for %s or it has been called "
+"with the wrong number of arguments"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:68
+#, python-format
+msgid ""
+"Instance %(name)s running on %(host)s could not be found in the database:"
+" assuming it is a worker VM and skip ping migration to a new host"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:80
+#, python-format
+msgid "Aggregate for host %(host)s count not be found."
+msgstr ""
+
+#: nova/virt/xenapi/host.py:101
+#, python-format
+msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:185
+#, python-format
+msgid "Failed to extract instance support from %s"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:202
+msgid "Unable to get updated status"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:205
+#, python-format
+msgid "The call to %(method)s returned an error: %(e)s."
+msgstr ""
+
+#: nova/virt/xenapi/network_utils.py:29
+#, python-format
+msgid "Found non-unique network for name_label %s"
+msgstr ""
+
+#: nova/virt/xenapi/network_utils.py:47
+#, python-format
+msgid "Found non-unique network for bridge %s"
+msgstr ""
+
+#: nova/virt/xenapi/network_utils.py:49
+#, python-format
+msgid "Found no network for bridge %s"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:71
+#, python-format
+msgid ""
+"Aggregate %(aggregate_id)s: unrecoverable state during operation on "
+"%(host)s"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:158
+#, python-format
+msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:175
+#, python-format
+msgid "Unable to eject %(host)s from the pool; No master found"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:192
+#, python-format
+msgid "Pool-Join failed: %(e)s"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:195
+#, python-format
+msgid "Unable to join %(host)s in the pool"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:211
+#, python-format
+msgid "Pool-eject failed: %(e)s"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:223
+#, python-format
+msgid "Unable to set up pool: %(e)s."
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:234
+#, python-format
+msgid "Pool-set_name_label failed: %(e)s"
+msgstr ""
+
+#: nova/virt/xenapi/vif.py:101
+#, python-format
+msgid "Found no PIF for device %s"
+msgstr ""
+
+#: nova/virt/xenapi/vif.py:120
+#, python-format
+msgid ""
+"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"Expected %(vlan_num)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:273
+msgid "Created VM"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:285
+msgid "VM destroyed"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
+msgid "VM already halted, skipping shutdown..."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:294
+msgid "Shutting down VM (cleanly)"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:309
+msgid "Shutting down VM (hard)"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:347
+#, python-format
+msgid "VBD not found in instance %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:364
+#, python-format
+msgid "VBD %s already detached"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:367
+#, python-format
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:372
+#, python-format
+msgid "Unable to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:377
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:388
+#, python-format
+msgid "Unable to destroy VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:410
+#, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:413
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:439
+#, python-format
+msgid "Unable to destroy VDI %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:466
+#, python-format
+msgid ""
+"Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
+" on %(sr_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:480
+msgid "SR not present and could not be introduced"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:505
+#, python-format
+msgid "block device info: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:591
+#, python-format
+msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:636
+#, python-format
+msgid "No primary VDI found for %(vm_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:649
+msgid "Starting snapshot for VM"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:699
+#, python-format
+msgid "Destroying cached VDI '%(vdi_uuid)s'"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:952
+#, python-format
+msgid ""
+"Fast cloning is only supported on default local SR of type ext. SR on "
+"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1008
+#, python-format
+msgid "Unrecognized cache_images value '%s', defaulting to True"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1042
+#, python-format
+msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1054
+#, python-format
+msgid ""
+"download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
+"params: %(params)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1067
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1102
+#, python-format
+msgid "Invalid value '%s' for xenapi_torrent_images"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1113
+#, python-format
+msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1188
+#, python-format
+msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1203
+#, python-format
+msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1207
+#, python-format
+msgid ""
+"Image size %(size_bytes)d exceeded instance_type allowed size "
+"%(allowed_size_bytes)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1229
+#, python-format
+msgid "Fetching image %(image_id)s, type %(image_type_str)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1242
+#, python-format
+msgid "Size for image %(image_id)s: %(virtual_size)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1251
+#, python-format
+msgid ""
+"Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
+"bytes"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1270
+#, python-format
+msgid "Copying VDI %s to /boot/guest on dom0"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1284
+#, python-format
+msgid "Kernel/Ramdisk VDI %s destroyed"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1293
+msgid "Failed to fetch glance image"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1334
+#, python-format
+msgid "Detected %(image_type_str)s format for image %(image_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1365
+#, python-format
+msgid "Looking up vdi %s for PV kernel"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1383
+#, python-format
+msgid ""
+"Image format is None: trying to determine PV status using pygrub; if "
+"instance with vdi %s does not boot correctly, try with image metadata."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1389
+#, python-format
+msgid "Unknown image format %(disk_image_type)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1420
+#, python-format
+msgid "VDI %s is still available"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1523
+#, python-format
+msgid "Unable to parse rrd of %(vm_uuid)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1550
+#, python-format
+msgid "Re-scanning SR %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1578
+#, python-format
+msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1596
+msgid ""
+"XenAPI is unable to find a Storage Repository to install guest instances "
+"on. Please check your configuration and/or configure the flag "
+"'sr_matching_filter'"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1609
+msgid "Cannot find SR of content-type ISO"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1617
+#, python-format
+msgid "ISO: looking at SR %(sr_rec)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1619
+msgid "ISO: not iso content"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1622
+msgid "ISO: iso content_type, no 'i18n-key' key"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1625
+msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1629
+msgid "ISO: SR MATCHing our criteria"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1631
+msgid "ISO: ISO, looking to see if it is host local"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1634
+#, python-format
+msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1637
+#, python-format
+msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1640
+msgid "ISO: SR with local PBD"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1662
+#, python-format
+msgid ""
+"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
+"%(server)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1678
+#, python-format
+msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1732
+#, python-format
+msgid "Invalid statistics data from Xenserver: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1792
+#, python-format
+msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1879
+#, python-format
+msgid ""
+"Parent %(parent_uuid)s doesn't match original parent "
+"%(original_parent_uuid)s, waiting for coalesce..."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1889
+#, python-format
+msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1924
+#, python-format
+msgid "Timeout waiting for device %s to be created"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1944
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1957
+#, python-format
+msgid "Plugging VBD %s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1960
+#, python-format
+msgid "Plugging VBD %s done."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1962
+#, python-format
+msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1965
+#, python-format
+msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1970
+#, python-format
+msgid "Destroying VBD for VDI %s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1978
+#, python-format
+msgid "Destroying VBD for VDI %s done."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2005
+#, python-format
+msgid "Running pygrub against %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2013
+#, python-format
+msgid "Found Xen kernel %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2015
+msgid "No Xen kernel found.  Booting HVM."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2017
+msgid ""
+"Error while executing pygrub! Please, ensure the binary is installed "
+"correctly, and available in your PATH; on some Linux distros, pygrub may "
+"be installed in /usr/lib/xen-X.Y/bin/pygrub. Attempting to boot in HVM "
+"mode."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2034
+msgid "Partitions:"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2040
+#, python-format
+msgid "  %(num)s: %(ptype)s %(size)d sectors"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2065
+#, python-format
+msgid ""
+"Writing partition table %(primary_first)d %(primary_last)d to "
+"%(dev_path)s..."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2078
+#, python-format
+msgid "Writing partition table %s done."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
+#, python-format
+msgid ""
+"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
+"virtual_size=%(virtual_size)d block_size=%(block_size)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2183
+#, python-format
+msgid ""
+"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
+"reduction in size"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2235
+msgid "Manipulating interface files directly"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2244
+#, python-format
+msgid "Failed to mount filesystem (expected for non-linux instances): %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2356
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
+#, python-format
+msgid "Updating progress to %(progress)d"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:174
+#, python-format
+msgid "Importing image upload handler: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:187
+msgid "Error: Agent is disabled"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:301
+msgid "Starting instance"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:387
+msgid "Removing kernel/ramdisk files from dom0"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:460
+#, python-format
+msgid "Block device information present: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:491
+msgid "Failed to spawn, rolling back"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:590
+msgid "Auto configuring disk, attempting to resize partition..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:636
+msgid "Starting VM"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:642
+msgid "Waiting for instance state to become running"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:656
+#, python-format
+msgid ""
+"Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
+"%(version)s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:659
+#, python-format
+msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:670
+#, python-format
+msgid "Instance agent version: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:701
+msgid "Setting VCPU weight"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:712
+#, python-format
+msgid "Could not find VM with name %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:770
+msgid "Finished snapshot and upload for VM"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:774
+#, python-format
+msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:782
+msgid "Failed to transfer vhd to new host"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:812
+msgid "Clean shutdown did not complete successfully, trying hard shutdown."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:816
+msgid "Unable to terminate instance."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:821
+msgid "Resize down not allowed without auto_disk_config"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
+#, python-format
+msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:995
+msgid "Resize complete"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1039
+msgid "Starting halted instance found during reboot"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1045
+msgid ""
+"Reboot failed due to bad volumes, detaching bad volumes and starting "
+"halted instance"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1139
+msgid "Unable to find root VBD/VDI for VM"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1143
+msgid "Destroying VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1170
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1177
+msgid "instance has a kernel or ramdisk but not both"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1184
+msgid "kernel/ramdisk files removed"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1211
+msgid "Destroying VM"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1240
+msgid "VM is not present, skipping destroy..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1291
+#, python-format
+msgid "Instance is already in Rescue Mode: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1325
+msgid "VM is not present, skipping soft delete..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1378
+msgid "Automatically hard rebooting"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1518
+msgid "Injecting network info to xenstore"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1537
+msgid "Creating vifs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1546
+#, python-format
+msgid "Creating VIF for network %(network_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1549
+#, python-format
+msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1577
+msgid "Injecting hostname to xenstore"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1675
+#, python-format
+msgid ""
+"Destination host:%(hostname)s must be in the same aggregate as the source"
+" server"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1696
+msgid "No suitable network for migrate"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1708
+msgid "Migrate Receive failed"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1782
+msgid "XAPI supporting relax-xsm-sr-check=true requried"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1793
+msgid "VM.assert_can_migrate failed"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1846
+msgid "Migrate Send failed"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:51
+#, python-format
+msgid "Creating SR %(label)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:61
+#, python-format
+msgid "Introducing SR %(label)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:68
+msgid "Creating PBD for SR"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:71
+msgid "Plugging SR"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:82
+msgid "Forgetting SR..."
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:104
+#, python-format
+msgid "Unable to find SR from VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:121
+#, python-format
+msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:129
+#, python-format
+msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:153
+#, python-format
+msgid "Unable to introduce VDI on SR %s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:161
+#, python-format
+msgid "Unable to get record of VDI %s on"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:183
+#, python-format
+msgid "Unable to introduce VDI for SR %s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:193
+msgid "Cannot purge SR with referenced VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:202
+#, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:241
+#, python-format
+msgid "Unable to obtain target information %(connection_data)s"
+msgstr ""
+
+#: nova/virt/xenapi/volumeops.py:70
+#, python-format
+msgid "Connect_volume: %(connection_info)s"
+msgstr ""
+
+#: nova/virt/xenapi/volumeops.py:139
+#, python-format
+msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgstr ""
+
+#: nova/virt/xenapi/imageupload/glance.py:64
+#, python-format
+msgid ""
+"Asking xapi to upload to glance %(vdi_uuids)s as ID %(image_id)s glance "
+"server: %(glance_host)s:%(glance_port)d attempt "
+"%(attempt_num)d/%(max_attempts)d"
+msgstr ""
+
+#: nova/virt/xenapi/imageupload/glance.py:77
+#, python-format
+msgid "upload_vhd failed: %r"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:95 nova/vnc/xvp_proxy.py:100
+#, python-format
+msgid "Error in handshake: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:116
+#, python-format
+msgid "Invalid request: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:136
+#, python-format
+msgid "Request: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:139
+#, python-format
+msgid "Request made with missing token: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:149
+#, python-format
+msgid "Request made with invalid token: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:156
+#, python-format
+msgid "Unexpected error: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:176
+#, python-format
+msgid "Starting nova-xvpvncproxy node (version %s)"
+msgstr ""
+
+#: nova/volume/cinder.py:98
+#, python-format
+msgid "Cinderclient connection created using URL: %s"
+msgstr ""
+
+#: nova/volume/cinder.py:229
+msgid "status must be 'in-use'"
+msgstr ""
+
+#: nova/volume/cinder.py:235
+msgid "status must be 'available'"
+msgstr ""
+
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr ""
+
+#~ msgid "Got update to delete instance %(instance_uuid)s"
+#~ msgstr ""
+
diff --git a/nova/locale/bs/LC_MESSAGES/nova.po b/nova/locale/bs/LC_MESSAGES/nova.po
index 3d2bc7e26..57aa51b13 100644
--- a/nova/locale/bs/LC_MESSAGES/nova.po
+++ b/nova/locale/bs/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+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"
@@ -83,7 +83,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -167,8 +167,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -198,7 +198,7 @@ msgstr ""
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
@@ -1234,55 +1234,67 @@ msgstr ""
 
 #: nova/exception.py:1157
 #, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1293,7 +1305,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1313,205 +1325,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-msgid "Full set of CONF:"
-msgstr ""
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, python-format
-msgid "Starting %d workers"
-msgstr ""
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1596,130 +1528,125 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
@@ -1729,69 +1656,74 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, python-format
+msgid "Invalid IP protocol %s."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
@@ -1800,7 +1732,7 @@ msgstr ""
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
@@ -1810,7 +1742,7 @@ msgid "Detach Volume Failed."
 msgstr ""
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
@@ -1842,137 +1774,137 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2012,11 +1944,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr ""
@@ -2035,19 +1967,19 @@ msgstr ""
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -2059,63 +1991,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:364
+#: nova/api/openstack/common.py:366
 #, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -2169,14 +2101,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
 #: nova/api/openstack/extensions.py:370
 #, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2219,13 +2151,13 @@ msgstr ""
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr ""
 
@@ -2234,20 +2166,20 @@ msgstr ""
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, python-format
 msgid "Calling method %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2260,12 +2192,12 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2273,17 +2205,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2348,210 +2280,210 @@ msgstr ""
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, python-format
 msgid "Flavor '%s' could not be found "
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2559,9 +2491,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
+#: nova/api/openstack/compute/servers.py:1408
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+msgid "Removing options '%s' from query"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2648,7 +2580,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2668,17 +2600,17 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2830,15 +2762,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
@@ -2946,7 +2878,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -2979,29 +2911,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3220,33 +3152,33 @@ msgstr ""
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, python-format
 msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3265,94 +3197,93 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:838
-#, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+#: nova/cells/messaging.py:862
+msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3369,7 +3300,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3383,7 +3314,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3409,7 +3340,7 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, python-format
 msgid "Failed to load %s"
 msgstr ""
@@ -3429,270 +3360,270 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3772,242 +3703,242 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4041,714 +3972,719 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, python-format
 msgid "Host %(host)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -4858,7 +4794,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -4869,7 +4805,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -4947,54 +4883,50 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5011,51 +4943,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5140,15 +5072,19 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 msgid "Failed storing info cache"
 msgstr ""
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -5262,103 +5198,103 @@ msgstr ""
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5453,38 +5389,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5519,7 +5455,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5601,65 +5537,65 @@ msgstr ""
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5676,27 +5612,27 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5706,17 +5642,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5789,11 +5725,91 @@ msgstr ""
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+msgid "Full set of CONF:"
+msgstr ""
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr ""
@@ -5932,57 +5948,62 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -6296,7 +6317,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6305,36 +6326,48 @@ msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:357
+#: nova/scheduler/filter_scheduler.py:361
 #, python-format
-msgid "Choosing host %(chosen_host)s"
+msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6529,46 +6562,46 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 msgid "memcached_servers not defined"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6621,58 +6654,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr ""
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 msgid "fake vswitch not found"
 msgstr ""
@@ -6706,17 +6723,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6725,7 +6742,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
@@ -6742,16 +6759,16 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 msgid "spawn error"
 msgstr ""
 
@@ -6847,6 +6864,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -6871,11 +6904,10 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -6995,19 +7027,19 @@ msgstr ""
 msgid "ipmitool stdout: '%(out)s', stderr: '%(err)s'"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7175,15 +7207,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7241,97 +7273,97 @@ msgstr ""
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7665,7 +7697,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7679,24 +7711,24 @@ msgstr ""
 msgid "Host IP address is: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8017,12 +8049,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8180,7 +8212,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8248,201 +8280,201 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8450,73 +8482,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8524,50 +8556,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8577,67 +8609,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8670,153 +8702,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, python-format
 msgid "Writing stored info to %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -8929,87 +8961,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9081,35 +9113,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
@@ -9200,74 +9232,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, python-format
 msgid "LPAR instance '%s' not found"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, python-format
 msgid "Instance '%s' failed to boot"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, python-format
 msgid "Shutting down the instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9723,7 +9755,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -9881,19 +9913,19 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -9997,24 +10029,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -10151,374 +10183,374 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10526,55 +10558,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -10588,193 +10627,202 @@ msgstr ""
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+msgid "Unable to terminate instance."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -10902,16 +10950,28 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 msgid "status must be 'in-use'"
 msgstr ""
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr ""
+
+#~ msgid "Got update to delete instance %(instance_uuid)s"
+#~ msgstr ""
+
diff --git a/nova/locale/cs/LC_MESSAGES/nova.po b/nova/locale/cs/LC_MESSAGES/nova.po
index 318b5a055..751732d1f 100644
--- a/nova/locale/cs/LC_MESSAGES/nova.po
+++ b/nova/locale/cs/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+0000\n"
 "PO-Revision-Date: 2012-05-17 20:04+0000\n"
 "Last-Translator: Zbyněk Schwarz <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -88,7 +88,7 @@ msgstr "Cesta příznaků: %s"
 msgid "An unknown exception occurred."
 msgstr "Vyskytla se neo�ekávaná výjimka."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -173,8 +173,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr "Data páru klí�ů jsou neplatná"
 
@@ -205,7 +205,7 @@ msgstr "Neplatný klí� metadata"
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Neplatný rozsah portů %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Neplatný protokol IP %(protocol)s."
@@ -1276,57 +1276,69 @@ msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "Dvojice klí�ů %(name)s nenalezena pro uživatele %(user_id)s"
 
 #: nova/exception.py:1157
+#, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "Kvóta pro projekt %(project_id)s nemohla být nalezena."
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Projekt %(project_id)s nemohl být nalezen."
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "set_admin_password není tímto ovlada�em zavedeno"
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "Instance %(instance_id)s není v nouzovém režimu."
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "Instance %(instance_id)s není v nouzovém režimu."
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1337,7 +1349,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr "Oznamování schopností plánova�ům ..."
 
@@ -1358,206 +1370,125 @@ msgstr "Soubor JSON představující zásady"
 msgid "Rule checked when requested rule is not found"
 msgstr "Kontrolované pravidlo, když požadované není nalezeno"
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-#, fuzzy
-msgid "Full set of CONF:"
-msgstr "Úplná sada PŘ�ZNAKŮ:"
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr "%(flag)s : SADA PŽ�ZNAKŮ "
-
-#: nova/service.py:214 nova/service.py:312
-#, fuzzy, python-format
-msgid "Caught %s, exiting"
-msgstr "snímek %s: mazání"
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, fuzzy, python-format
-msgid "Starting %d workers"
-msgstr "po�áte�ní adresa"
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, fuzzy, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr "Za�ínající uzel %(topic)s (verze %(vcs_string)s)"
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr "Vytváření připojení zákazníka pro službu %s"
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "Ukon�ena služba bez záznamu v databázi"
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr "Spouštění příkazu (SSH): %s"
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr "Prostředí není podporováno přes SSH"
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr "process_input není podporován přes SSH"
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr "Výsledek byl %s"
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr "ladění ve zpětném volání: %s"
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Adresa místního spojení nenalezena.: %s"
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Nelze získat IP místního spojení %(interface)s :%(ex)s"
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Neplatná podpůrná vrstva: %s"
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, fuzzy, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr "Neznámý základní soubor: %s"
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "O�ekáván objekt typu: %s"
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Neplatný  server_string: %s"
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc: '%(name)s' trvalo %(total_time).2f sek"
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, fuzzy, python-format
 msgid "Reloading cached file %s"
 msgstr "Odstraňování základního souboru: %s"
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "Nelze odstranit kontejner: %s"
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, fuzzy, python-format
 msgid "%s is not a string or unicode"
 msgstr "Název serveru není řetězec nebo unicode"
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, fuzzy, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr "Dvojice klí�ů musí být dlouhá 1 až 255 znaků."
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1642,7 +1573,7 @@ msgstr "Obalova�chyb: %s"
 msgid "Too many failed authentications."
 msgstr "Příliš mnoho ověření selhalo."
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
@@ -1651,124 +1582,119 @@ msgstr ""
 "Přístupový klí� %(access_key)s %(failures)d krát selhal při ověření a "
 "bude zablokován na %(lock_mins)d minut."
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr "Podpis není zadán"
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr "Přístupový klí� není zadán"
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr "Chyba při komunikaci s keystone"
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "Přesun před spuštěním selhal na %(dest)s"
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "Příliš mnoho ověření selhalo."
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr "�innost: %s"
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\thod: %(value)s"
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "Neoprávnění požadavek pro ovlada�=%(controller)s a �innost=%(action)s"
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "Vyvoláno InstanceNenalezena: %s"
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "Vyvoláno SvazekNenalezen: %s"
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr "Vyvoláno SnímekNenalzen: %s"
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "Vyvoláno Nenalezeno: %s"
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr "Vyvoláno ChybaApiEC2: %s"
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr "Vyvoláno DvojiceKlí�ůExistuje: %s"
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, fuzzy, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr "Vyvoláno NeplatnáOperace: %s"
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr "Vyvoláno NeplatnáHodnotaParametru: %s"
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr "Vyvoláno NeplatnýROzsahPortů: %s"
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr "Vyvoláno NeníOprávněno: %s"
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr "Vyvoláno NeplatnáOperace: %s"
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "Vyvolána neznámá chyba: %s"
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Vyvolána neznámá chyba: %s"
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr "Prostředí: %s"
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "Vyskytla se neznámá chyba. Prosím zopakujte Váš požadavek."
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
@@ -1780,70 +1706,75 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr "Vytvořit snímek svazku %s"
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "Nelze dešifrovat soukromý klí�: %s"
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr "Vytvořit dvojici klí�ů %s"
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr "Imprtovat klí� %s"
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Smazat dvojici klí�ů %s"
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "Není dostatek parametrů k sestavení platného pravidla."
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, fuzzy, python-format
+msgid "Invalid IP protocol %s."
+msgstr "Neplatný protokol IP %(protocol)s."
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr "Pro zadané parametry není žádné pravidlo."
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Toto pravidlo již existuje ve skupině %s"
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Získat výstup konzole pro instanci %s"
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "Vytvořit svazek ze snímku %s"
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Vytvořit svazek o %s GB"
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 #, fuzzy
 msgid "Delete Failed"
 msgstr "Vytvoření selhalo"
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "Připojit svazek %(volume_id)s k instanci %(instance_id)s na %(device)s"
@@ -1853,7 +1784,7 @@ msgstr "Připojit svazek %(volume_id)s k instanci %(instance_id)s na %(device)s"
 msgid "Attach Failed."
 msgstr "Vytvoření selhalo"
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Odpojit svazek %s"
@@ -1864,7 +1795,7 @@ msgid "Detach Volume Failed."
 msgstr "Odpojit svazek %s"
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "vlastnost není podporována: %s"
@@ -1898,145 +1829,145 @@ msgstr "Nelze najít adresu %r"
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "Přidělit adresu %(public_ip)s k instanci %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Nelze najít adresu %r"
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, fuzzy, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr "existuje mnoho pevných ip, použita je první: %s"
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 #, fuzzy
 msgid "Floating ip is already associated."
 msgstr "Plovoucí ip %(address)s je přidružena."
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 #, fuzzy
 msgid "l3driver call to add floating ip failed."
 msgstr "Je dostupných nula plovoucích ip."
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Nelze najít adresu %r"
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Oddělit adresu %s"
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 #, fuzzy
 msgid "Floating ip is not associated."
 msgstr "Plovoucí ip %(address)s není přidružena."
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr "Obraz musí být dostupný"
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr "BUde spuštěno ukon�ování insatncí"
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Restratovat instanci %r"
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr "Instance budou zastaveny"
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr "Instance budou spuštěny"
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr "Zrušení registrace obrazu %s"
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Obraz %(image_location)s registrován s id %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr "uživatel nebo skupina nebyly zadány"
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr "podporována je pouze skupina \"all\""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr "operation_type musí být add nebo remove"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Aktualizace publicity obrazu %s"
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "Nelze zastavit instanci za %d sek"
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 #, fuzzy
 msgid "Expecting a list of resources"
 msgstr "Získávání seznamu instancí"
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance - %s není přítomno"
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 #, fuzzy
 msgid "Expecting a list of tagSets"
 msgstr "Získávání seznamu instancí"
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "Neplatná data jednotky"
@@ -2078,12 +2009,12 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 #, fuzzy
 msgid "Invalid proxy request signature."
 msgstr "Neplatný požadavek: %s"
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, fuzzy, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr "Nelze získat metadata pro ip: %s"
@@ -2102,19 +2033,19 @@ msgstr "%(url)s vrácena s HTTP %(status)d"
 msgid "Must specify an ExtensionManager class"
 msgstr "Musí být ur�ena třída ExtensionManager"
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr "Rozšířený zdroj: %s"
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr "Rozšíření %(ext_name)s: nelze rozšířit %(collection)s: Žádný takový zdroj"
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr "Rozšíření %(ext_name)s: rozšiřování zdroje %(collection)s"
@@ -2126,64 +2057,64 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr "parametr limit musí být celé �íslo"
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr "parametr limit musí být kladný"
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr "parametr offset musí být celé �íslo"
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr "parametr offset musí být kladný"
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr "zna�ka [%s] nenalezena"
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr "href %s neobsahuje verzi"
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr "Metadata obrazu překra�ují limit"
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 #, fuzzy
 msgid "Invalid image metadata"
 msgstr "Neplatná metadata"
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr "Nelze '%(action)s' zatímco instance je %(attr)s %(state)s"
 
-#: nova/api/openstack/common.py:364
-#, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+#: nova/api/openstack/common.py:366
+#, fuzzy, python-format
+msgid "Instance is in an invalid state for '%s'"
 msgstr "Instance je v neplatném stavu pro '%(action)s'"
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr "Odmítnutí žádosti o snímek, snímky jsou nyní zakázány"
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr "Snímky instance nejsou v sou�asnosti povoleny."
 
@@ -2237,14 +2168,14 @@ msgstr "Volání továrny rozšíření %s"
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "Nelze na�ít rozšížení %(ext_factory)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "Nelze na�íst rozšíření %(classpath)s: %(exc)s"
 
 #: nova/api/openstack/extensions.py:370
-#, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+#, fuzzy, python-format
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr "Nelze na�íst rozšíření %(ext_name)s: %(exc)s"
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2287,13 +2218,13 @@ msgstr "V požadavku zadáno prázdné tělo"
 msgid "There is no such action: %s"
 msgstr "Žádná taková �innost: %s"
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr "Poškozené tělo požadavku"
 
@@ -2302,20 +2233,20 @@ msgstr "Poškozené tělo požadavku"
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, fuzzy, python-format
 msgid "Calling method %s"
 msgstr "Volání pro získání %s"
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr "Nepodporovaný Content-Type"
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr "Poškozená url požadavku"
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2328,14 +2259,14 @@ msgstr "prvek není podřazený"
 msgid "root element selecting a list"
 msgstr "kořenový prvek volí seznam"
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 "Neshoda stromu šablony; přidávání sluhy %(slavetag)s k pánovi "
 "%(mastertag)s"
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr "podtřídy musí zavádět construct()!"
 
@@ -2343,17 +2274,17 @@ msgstr "podtřídy musí zavádět construct()!"
 msgid "Initializing extension manager."
 msgstr "Zavádění správce rozšíření."
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, fuzzy, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr "Neplatný podpis pro uživatele %s"
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, fuzzy, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr "Neplatný podpis pro uživatele %s"
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2420,220 +2351,220 @@ msgstr "Server neexistuje"
 msgid "Metadata item was not found"
 msgstr "Položka metadat nenalezena"
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr "Neplatná hodnota changes-since"
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 #, fuzzy
 msgid "Only administrators may list deleted instances"
 msgstr "Pokus o jemné smazání %s"
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, fuzzy, python-format
 msgid "Flavor '%s' could not be found "
 msgstr "Hostitel %(host)s nemohl být nalezen."
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr "Instance nemohla být nalezena"
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr "Špatný formát osobnosti: chybí %s"
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr "Špatný formát osobnosti"
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr "Obsah osobnosti pro %s nemůže být dekódován"
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 #, fuzzy
 msgid "Unknown argment : port"
 msgstr "neznámá chyby připojení hosta"
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, fuzzy, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr "Špatný formát sítí: uuid sítě není ve správném formátu (%s)"
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr "Špatný formát sítí: uuid sítě není ve správném formátu (%s)"
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr "Neplatná pevná IP adresa (%s)"
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr "Duplicitní sítě (%s) nejosu povoleny"
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr "Špatný formát sítě: chybí %s"
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr "Špatný formát sítě"
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr "Obsah uživatelských dat nemůže být dekódován"
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr "accessIPv4 není ve správném formátu IPv4"
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 #, fuzzy
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr "accessIPv4 není ve správném formátu IPv4"
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr "Název serveru není ur�en"
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr "Zadáno neplatné flavorRef."
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 #, fuzzy
 msgid "min_count must be an integer value"
 msgstr "parametr limit musí být celé �íslo"
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 #, fuzzy
 msgid "max_count must be an integer value"
 msgstr "parametr limit musí být celé �íslo"
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr "Nelze najít požadovaný obraz"
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr "Zadán neplatný název_klí�e."
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "id nemůže být None"
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "id nemůže být None"
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr "Instanci nebyla změněna velikost."
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "Instance %(instance_id)s nemohla být nastavena."
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr "Argument 'type' pro restart není HARD �i SOFT"
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr "Chybí argument 'type' pro restart"
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr "Nelze najít požadovanou konfiguraci."
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 #, fuzzy
 msgid "Resize requires a flavor change."
 msgstr "Resize vyžaduje změnu velikosti."
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr "Chybí vlastnost imageRef"
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr "Zadáno neplatné imageRef."
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr "Chybí vlastnost flavorRef"
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr "Nebylo zadáno adminPass"
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr "Neplatné adminPass"
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Nelze restartovat instanci"
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr "Nelze zpracovat metadata dvojic hodnot/klí�ů."
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "Požadavek na změnu velikosti má neplatnou vlastnost 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "Požadavek na změnu velikosti vyžaduje vlastnost 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr "Neplatné tělo požadavku"
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr "Nelze zpracovat imageRef z požadavku."
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr "Nelze najít obraz ke znovu sestavení"
 
@@ -2641,9 +2572,9 @@ msgstr "Nelze najít obraz ke znovu sestavení"
 msgid "createImage entity requires name attribute"
 msgstr "Objekt createImage cyžaduje vlastnost name"
 
-#: nova/api/openstack/compute/servers.py:1409
-#, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+#: nova/api/openstack/compute/servers.py:1408
+#, fuzzy, python-format
+msgid "Removing options '%s' from query"
 msgstr "Odstraňování voleb '%(unk_opt_str)s' z fronty"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2731,7 +2662,7 @@ msgstr "host a block_migration musí být zadány."
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, fuzzy, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr "Migrace za chodu instance %(id)s na hostitele %(host)s selhala"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2750,19 +2681,19 @@ msgid "Compute.api::resetState %s"
 msgstr "compute.api::pokra�ování %s"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
-#, python-format
-msgid "Cannot show aggregate: %(id)s"
-msgstr ""
+#, fuzzy, python-format
+msgid "Cannot show aggregate: %s"
+msgstr "Nelze aktualizovat agenta: %(resp)r"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, fuzzy, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr "Nelze aktualizovat agenta: %(resp)r"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
-#, python-format
-msgid "Cannot delete aggregate: %(id)s"
-msgstr ""
+#, fuzzy, python-format
+msgid "Cannot delete aggregate: %s"
+msgstr "Nelze aktualizovat agenta: %(resp)r"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
 #, python-format
@@ -2925,16 +2856,16 @@ msgstr "Síť nemá �innost %s"
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr "%s musí být bu� 'MANUAL' nebo 'AUTO'."
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 #, fuzzy
 msgid "host and onSharedStorage must be specified."
 msgstr "host a block_migration musí být zadány."
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, fuzzy, python-format
 msgid "Error in evacuate, %s"
 msgstr "Chyba v přesunu %s"
@@ -3050,7 +2981,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "Plovoucí ip %(address)s není přidružena."
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3084,29 +3015,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr "Nastavování hostitele %(host)s na %(state)s."
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Volání pro získání %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Aktualizace statistik hostitele"
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr "Describe-resource je funkce pouze pro správce"
 
@@ -3337,33 +3268,33 @@ msgstr "svazek=%s"
 msgid "Delete volume with id: %s"
 msgstr "Smazat svazek s id: %s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, fuzzy, python-format
 msgid "Instance %s is not attached."
 msgstr "instance %s: není zavedena"
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, fuzzy, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr "Špatný formát sítí: uuid sítě není ve správném formátu (%s)"
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr "Připojit svazek %(volume_id)s k instanci %(server_id)s na %(device)s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr "Smazat snímek s id: %s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr "Vytvořit snímek ze svazku %s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3382,94 +3313,94 @@ msgstr "Uvolnit adresu %s"
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "pro zprávu není metoda: %s"
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, fuzzy, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr "Nelze na�ít rozšížení %(ext_factory)s: %(exc)s"
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "pro zprávu není metoda: %s"
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, fuzzy, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr "Odstraňování základního souboru: %s"
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, fuzzy, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr "Obsazena '%(method)s' do '%(host)s' výpo�tu"
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, fuzzy, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
-msgstr "Přesun nenalezen v instanci %(instance_id)s se stavem %(status)s."
+msgid "Got update for instance: %(instance)s"
+msgstr "Svazek není nalezen v instanci %(instance_id)s."
 
-#: nova/cells/messaging.py:838
+#: nova/cells/messaging.py:862
 #, fuzzy, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+msgid "Got update to delete instance"
 msgstr "Svazek není nalezen v instanci %(instance_id)s."
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3486,7 +3417,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "Svazek není nalezen v instanci %(instance_id)s."
@@ -3500,7 +3431,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3527,7 +3458,7 @@ msgstr "Síťovou masku kterou odeslat do nastavení openvpn"
 msgid "Launching VPN for %s"
 msgstr "Spouštění VPN pro %s"
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, fuzzy, python-format
 msgid "Failed to load %s"
 msgstr "Nelze vytvořit svazek"
@@ -3547,282 +3478,282 @@ msgstr "prvek není podřazený"
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 #, fuzzy
 msgid "leasing ip"
 msgstr "Vytváření obrazu"
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 #, fuzzy
 msgid "releasing ip"
 msgstr "Vytváření obrazu"
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 #, fuzzy
 msgid "Reserved"
 msgstr "obdrženo: %s"
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Chyba DB: %s"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 #, fuzzy
 msgid "network"
 msgstr "Reset sítě"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 #, fuzzy
 msgid "IP address"
 msgstr "po�áte�ní adresa"
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 #, fuzzy
 msgid "No fixed IP found."
 msgstr "Bylo nalezeno nula pevných ip."
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, fuzzy, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr "K instanci nejsou přidruženy žádné pevné ip"
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "Plovoucí ip %(address)s je přidružena."
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr "id"
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr "IPv4"
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr "IPv6"
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "po�áte�ní adresa"
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr "DNS1"
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr "DNS2"
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr "VlanID"
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr "projekt"
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr "uuid"
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 #, fuzzy
 msgid "No networks found"
 msgstr "Síť nenalezena"
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "%(req)s je vyžadováno pro vytvoření sítě."
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 #, fuzzy
 msgid "instance"
 msgstr "zastavit instanci %r"
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "Služba %(service_id)s nemohla být nalezena."
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "Služba %(service_id)s nemohla být nalezena."
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "Neo�ekávaná chyba: %s"
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 #, fuzzy
 msgid "PROJECT"
 msgstr "projekt"
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3906,26 +3837,26 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr "Překro�ena kvóta instancí. Nemůžete spustit další instance tohoto typu."
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 "Překro�ena kvóta instancí. Můžete spustit pouze %s dalších instancí "
 "tohoto typu."
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, fuzzy, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr "Překro�ena kvóta pro %(pid)s, pokus o spuštění %(min_count)s instancí"
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
@@ -3934,99 +3865,99 @@ msgstr ""
 "Překro�ena kvóta pro %(pid)s, pokus o nastavení %(num_metadata)s "
 "vlastností metadat"
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 #, fuzzy
 msgid "Metadata property key greater than 255 characters"
 msgstr "Bezpe�nostní skupina %s by neměla být větší než 255 znaků."
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 #, fuzzy
 msgid "Metadata property value greater than 255 characters"
 msgstr "Bezpe�nostní skupina %s by neměla být větší než 255 znaků."
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Nelze připojit svazek k instanci %s"
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Chystá se spuštění %s instancí..."
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "BUde spuštěno ukon�ování insatncí"
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "Instance typu %(instance_type_id)s nemohla být nalezena."
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "BUde spuštěno ukon�ování insatncí"
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, fuzzy, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr "Žádný hostitel pro instnaci %s, okamžitě smazána"
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Pokus o jemné smazání %s"
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Pokus o ukon�ení %s"
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Pokus o zastavení %s"
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Pokus o spuštění %s"
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr "Hledání podle: %s"
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Spouštění snímku ve VM %s"
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id je None. Předpokládán přesun."
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4035,62 +3966,62 @@ msgstr ""
 "Stará instance typu %(current_instance_type_name)s, nová instance typu "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, fuzzy, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr "Překro�ena kvóta pro %(pid)s, pokus o spuštění %(min_count)s instancí"
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Pokus o ukon�ení %s"
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr "Dvojice klí�ů musí být dlouhá 1 až 255 znaků."
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr "Bezpe�nostní skupina %s není řetězec nebo unicode"
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Bezpe�nostní skupina %s nemůže být prázdná."
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, fuzzy, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -4099,69 +4030,69 @@ msgstr ""
 "Hodnota (%s) parametru GroupName je neplatná. Délka překra�uje maximum "
 "255 znaků."
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr "Bezpe�nostní skupina %s by neměla být větší než 255 znaků."
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Vytvořit bezpe�nostní skupinu %s"
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Bezpe�nostní skupina %s již existuje"
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Nelze zni�it vbd %s"
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Id bezpe�nostní skupiny by mělo být celé �íslo"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr "Smazat bezpe�nostní skupinu %s"
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Pravidlo (%s) nenalezeno"
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "Přidávání pravidla bezpe�nostní skupiny: %r"
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Povolit přístup bezpe�nostní skupiny %s"
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Zrušit přístup bezpe�nostní skupiny %s"
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr "Id bezpe�nostní skupiny by mělo být celé �íslo"
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, fuzzy, python-format
 msgid "Aborting claim: %s"
 msgstr "Informace o síti instance: |%s|"
@@ -4196,85 +4127,85 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
+#, python-format
+msgid "'%s' argument must be greater than 0"
+msgstr ""
+
+#: nova/compute/flavors.py:108
 #, fuzzy, python-format
-msgid "'%s' argument must be a positive integer"
-msgstr "argumenty create musí být kladná celá �ísla"
+msgid "'%s' argument must be greater than or equal to 0"
+msgstr "Vlastnost createBackup 'rotation' musí být celé �íslo"
 
-#: nova/compute/flavors.py:113
+#: nova/compute/flavors.py:117
 #, fuzzy
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr "argumenty create musí být kladná celá �ísla"
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
-msgstr ""
-
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr "Chyba DB: %s"
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr "Instance typu %s není nalezena ke smazání"
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
@@ -4283,135 +4214,135 @@ msgstr ""
 "Nelze přesunout instanci (%(instance_id)s) na sou�asného hostitele "
 "(%(host)s)."
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Nelze restartovat instanci"
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr "Sou�asný stav je %(drv_state)s, stav v DB je %(db_state)s."
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr "Restartování instance po restartu nova-compute."
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 #, fuzzy
 msgid "Hypervisor driver does not support resume guests"
 msgstr "Ovlada� hypervizoru nepodporuje pravidla firewallu"
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Nelze pozastavit instanci"
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Ovlada� hypervizoru nepodporuje pravidla firewallu"
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Neo�ekávaný kód stavu"
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr "Kontrola stavu"
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "Nastavování bdm %s"
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "Instance nemohla být spuštěna"
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Chyba DB: %s"
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
@@ -4420,7 +4351,7 @@ msgstr ""
 "ID obrázku=%(image_id)s, velkost obrázku v bajtech=%(size_bytes)d, "
 "povoleno bajtů=%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
@@ -4429,101 +4360,101 @@ msgstr ""
 "Velikost %(size_bytes)d obrázku '%(image_id)s' překro�ila povolenou "
 "velkost %(allowed_size_bytes)d pro typ instance"
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr "Spouštění instance..."
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr "Instance selhala v nastavení sítě"
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "Informace o síti instance: |%s|"
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr "Instance selhala nastavení blokového zařízení"
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr "Instance nemohla být spuštěna"
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s nstance"
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Ignorování DiskNenalezen: %s"
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, fuzzy, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "Ignorování DiskNenalezen: %s"
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr "ukon�ování bdm %s"
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s. Nastavování stavu vm instance na ERROR"
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Znovu sestavování instance %s"
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, fuzzy, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr "%(path)s je ve sdíleném úložišti: %(reason)s"
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Vytvořit snímek ze svazku %s"
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Restartování instance %s"
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, fuzzy, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -4532,22 +4463,22 @@ msgstr ""
 "pokus o restartování nespuštěné instance: %(instance_uuid)s (stav: "
 "%(state)s o�ekáváno: %(running)s)"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "Nelze znovu sestavit instanci [%(instance_uuid)s]: %(exc)s"
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: znovu zavedena"
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: pořizování snímku"
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, fuzzy, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -4556,47 +4487,47 @@ msgstr ""
 "pokus o vytvoření snímku z nespuštěné instance: %(instance_uuid)s (stav: "
 "%(state)s o�ekáváno: %(running)s)"
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "Nalezeno %(num_images)d obrazů (střídání: %(rotation)d)"
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "Střídání %d záloh"
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr "Mazání obrazu %s"
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "Nelze nastavit heslo správce. Instance %s není spuštěna"
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 #, fuzzy
 msgid "Root password set"
 msgstr "Instance %s: Nastavení hesla root"
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 #, fuzzy
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr "set_admin_password není tímto ovlada�em zavedeno"
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, fuzzy, python-format
 msgid "set_admin_password failed: %s"
 msgstr "set_admin_password není tímto ovlada�em zavedeno"
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 #, fuzzy
 msgid "error setting admin password"
 msgstr "Chyba při nastavování hesla správce"
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, fuzzy, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
@@ -4605,179 +4536,179 @@ msgstr ""
 "pokus o vsunutí souboru do nespuštěné instance: %(instance_uuid)s (stav: "
 "%(current_power_state)s o�ekáváno: %(expected_state)s)"
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, fuzzy, python-format
 msgid "injecting file to %(path)s"
 msgstr "Vkládání cesty souboru: '%s'"
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Nelze pozastavit instanci"
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Chyba DB: %s"
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instance %s: rušení záchrany"
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instance nemá svazek."
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr "cíl stejný jako zdroj!"
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 #, fuzzy
 msgid "Pausing"
 msgstr "Aktualizování!"
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: získávání diagnostik"
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 #, fuzzy
 msgid "Reset network"
 msgstr "Reset sítě"
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 #, fuzzy
 msgid "Inject network info"
 msgstr "instance %s: vkládání informací o síti"
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "network_info vkládá: |%s|"
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 #, fuzzy
 msgid "Get console output"
 msgstr "Získat výstup konzole pro instanci %s"
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "instance %s: získávání konzole vnc"
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 #, fuzzy
 msgid "Getting spice console"
 msgstr "instance %s: získávání konzole vnc"
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr "Zavádění pomocí svazku %(volume_id)s ve %(mountpoint)s"
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr "Připojování svazku %(volume_id)s do %(mountpoint)s"
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, fuzzy, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr "Zavádění pomocí svazku %(volume_id)s ve %(mountpoint)s"
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "Připojování svazku %(volume_id)s do %(mountpoint)s"
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr "Odpojování svazku %(volume_id)s z bodu připojení %(mp)s"
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Odpojování svazku z neznámé instance %s"
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Připojování svazku %(volume_id)s do %(mountpoint)s"
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, fuzzy, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr "přidělování sítě pro instanci %s"
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, fuzzy, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr "Síť %(network_id)s nemohla být nalezena."
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, fuzzy, python-format
 msgid "Host %(host)s not found"
 msgstr "Hostitel %(host)s nemohl být nalezen."
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr "Přesun před spuštěním selhal na %(dest)s"
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 #, fuzzy
 msgid "_post_live_migration() is started.."
 msgstr "zahájen přesun po spuštění."
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr "Přesun instance do %(dest)s úspěšně dokon�en."
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -4785,21 +4716,21 @@ msgstr ""
 "Můžete vidět tuto chybu \"libvirt: QEMU error: Domain not found: no "
 "domain with matching name.\" Tuto chybu můžete bezpe�ně ignorovat."
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 #, fuzzy
 msgid "Post operation of migration started"
 msgstr "Spuštěna operace po migraci"
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Nelze získat metadata pro ip: %s"
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -4808,64 +4739,64 @@ msgstr ""
 "Nalezeno %(migration_count)d nepotvrzených přesunů starších než "
 "%(confirm_window)d vteřin"
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, fuzzy, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr "Vypínání VM pro instanci %(instance_uuid)s"
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "Instance %(instance_id)s nenalezena"
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 #, fuzzy
 msgid "In ERROR state"
 msgstr "Uzel je v neznámém chybovém stavu."
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr "Aktualizace mezipaměti využití šířky pásma"
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Aktualizace mezipaměti využití šířky pásma"
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr "Aktualizace stavu hostitele"
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -4874,67 +4805,67 @@ msgstr ""
 "Nalezeno %(num_db_instances)s v databázi a %(num_vm_instances)s na "
 "hypervizoru."
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "Instance není zapnuta"
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 #, fuzzy
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, překskování..."
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr "Znovu získávání smazané instance"
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Zaznamování ovlada�e svazku: %s"
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, fuzzy, python-format
 msgid "No service record for host %s"
 msgstr "Žádná služba pro ID výpo�tu %s"
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, fuzzy, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
@@ -4943,7 +4874,7 @@ msgstr ""
 "Zjištěna instance se jmenovkou '%(name_label)s', která je ozna�ena jako "
 "SMAZ�NA, ale stále je přítomna na hostiteli."
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, fuzzy, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
@@ -4952,13 +4883,18 @@ msgstr ""
 "Ni�ení instance se jmenovkou '%(name_label)s', která je ozna�ena jako "
 "SMAZ�NA, ale stále je přítomna na hostiteli."
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, fuzzy, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 "Nerozpoznaná hodnota '%(action)s' pro "
 "FLAGS.running_deleted_instance_action"
 
+#: nova/compute/manager.py:4129
+#, fuzzy, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr "Nastavování instance %(instance_uuid)s do stavu ERROR"
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -5070,7 +5006,7 @@ msgstr "Nelze najít hostitele pro instanci %s"
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5081,7 +5017,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 #, fuzzy
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr "block_device_mapping %s"
@@ -5162,56 +5098,52 @@ msgstr "Kontrola známky: %(token)s, %(token_valid)s)"
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 #, fuzzy
 msgid "Failed to notify cells of instance update"
 msgstr "Nelze restartovat instanci"
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 #, fuzzy
 msgid "Failed to notify cells of instance fault"
 msgstr "Nelze restartovat instanci"
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "Nerozpoznaná hodnota read_deleted '%s'"
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: zachráněna"
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5228,51 +5160,51 @@ msgstr "verze by měla být celé �íslo"
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5358,16 +5290,20 @@ msgstr "Špatná předpona pro to_global_ipv6: %s"
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr "Špatné id projektu pro to_global_ipv6: %s"
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 #, fuzzy
 msgid "Failed storing info cache"
 msgstr "Nelze restartovat instanci"
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, fuzzy, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr "Přidělit adresu %(public_ip)s k instanci %(instance_id)s"
@@ -5484,17 +5420,17 @@ msgstr "Tento ovlada� podporuje pouze záznamy typu 'a'."
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr "Pokus o odstranění řetězu %s, který neexistuje"
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr "Neznámý řetěz: %r"
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
@@ -5503,86 +5439,86 @@ msgstr ""
 "Pokus o odstranění neexistujícího pravidla: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr "IPTablesManager.použití úspěšně dokon�eno"
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, fuzzy, python-format
 msgid "arping error for ip %s"
 msgstr "chyba v httplib v %s: "
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, fuzzy, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr "Pid %d je starý, znovu spouštění dnsmasq"
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Hupping dnsmasq vrhl výjimku %s"
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d je starý, znovu spouštění dnsmasq"
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "ukon�ení radvd vrhlo %s"
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d je starý, znovu spouštění radvd"
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "Neplatný stav: '%s'"
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Spouštění rozhraní VLAN %s"
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Zajišťování mostu %s"
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "Zajišťování vlan %(vlan)s a mostu %(bridge)s"
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Nelze pozastavit instanci"
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Zajišťování mostu %s"
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Zajišťování mostu %s"
@@ -5683,18 +5619,18 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr "cidr je již používáno"
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 "požadovaný cidr (%(cidr)s) je v konfliktu s existující supersítí "
 "(%(super)s)"
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
@@ -5703,22 +5639,22 @@ msgstr ""
 "požadovaný cidr (%(cidr)s) je v konfliktu s existujícím menším cidr "
 "(%(smaller)s)"
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr "Síť již existuje!"
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "Síť musí být odlou�ena od projektu %s před smazáním"
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "Suma mezi po�tem sítí a spuštění vlan nemůže být větší než 4094"
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, fuzzy, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5756,7 +5692,7 @@ msgstr "_smazat: %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr "podsítě v4 jsou vyžadovány pro zastaralé nw_info"
 
@@ -5839,70 +5775,70 @@ msgstr "Plovoucí ip není nalezena pro id %(id)s."
 msgid "Quantum Error creating security group %s"
 msgstr "Smazat bezpe�nostní skupinu %s"
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Smazat bezpe�nostní skupinu %s"
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Zachycena chyba: %s"
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Smazat bezpe�nostní skupinu %s"
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Id bezpe�nostní skupiny by mělo být celé �íslo"
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Smazat bezpe�nostní skupinu %s"
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Zachycena chyba: %s"
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Bezpe�nostní skupina s pravidlem %(rule_id)s nenalezena."
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, fuzzy, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 "Bezpe�nostní skupina %(security_group_id)s není nalezena v projektu "
 "%(project_id)s."
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5921,27 +5857,27 @@ msgstr "Toto pravidlo již existuje ve skupině %s"
 msgid "Original exception being dropped: %s"
 msgstr "omezení cizího klí�e nemohlo být vynecháno"
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, 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\""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, 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\""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, 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\""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, 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\""
@@ -5951,17 +5887,17 @@ msgstr "Získán zámek souboru \"%(lock)s\" pro zámek metody \"%(method)s\""
 msgid "Deprecated: %s"
 msgstr "Neo�ekávaná chyba: %s"
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr "zařízení záznamu systému musí být jedno z: %s"
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, fuzzy, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr "Třída %(fullname)s je zastaralá: %(msg)s"
@@ -6036,11 +5972,92 @@ msgstr "Získány neznámé argumenty klí�ového slova pro utils.execute: %r"
 msgid "Running cmd (subprocess): %s"
 msgstr "Spouštění příkazu (podproces): %s"
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr "Výsledek byl %s"
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r selhalo. Opakování."
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr "Spouštění příkazu (SSH): %s"
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr "Prostředí není podporováno přes SSH"
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr "process_input není podporován přes SSH"
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+#, fuzzy
+msgid "Full set of CONF:"
+msgstr "Úplná sada PŘ�ZNAKŮ:"
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, fuzzy, python-format
+msgid "Caught %s, exiting"
+msgstr "snímek %s: mazání"
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, fuzzy, python-format
+msgid "Starting %d workers"
+msgstr "po�áte�ní adresa"
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr "Vyjímka DB zabalena."
@@ -6179,12 +6196,12 @@ msgstr "Provádění asynchronního obsazení rozvětvení..."
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 #, fuzzy
 msgid "An unknown RPC related exception occurred."
 msgstr "Vyskytla se neo�ekávaná výjimka."
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
@@ -6193,46 +6210,51 @@ msgstr ""
 "Vzdálená chyba: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr "Neplatné znovu použití připojení RPC."
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, fuzzy, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr "Nelze odstranit %(base_file)s, chyba byla %(error)s"
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Volajícímu je vrácena výjimka: %s"
@@ -6558,7 +6580,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6568,37 +6590,49 @@ msgstr ""
 "(hostitel:%(avail)s <= instance:%(mem_inst)s)"
 
 #: nova/scheduler/filter_scheduler.py:73
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+#, fuzzy, python-format
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr "Pokus o sestavení %(num_instances)d instancí"
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, fuzzy, python-format
+msgid "Request Spec: %s"
+msgstr "Požadavek: %s"
+
+#: nova/scheduler/filter_scheduler.py:97
+#, fuzzy, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr "Svazek není nalezen v instanci %(instance_id)s."
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "Filtrováno %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:357
-#, python-format
-msgid "Choosing host %(chosen_host)s"
-msgstr ""
+#: nova/scheduler/filter_scheduler.py:361
+#, fuzzy, python-format
+msgid "Weighed %(hosts)s"
+msgstr "Filtrováno %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6795,47 +6829,47 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr "Obnoveno připojení modelového serveru!"
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr "modelový server je nedostupný"
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 #, fuzzy
 msgid "memcached_servers not defined"
 msgstr "Název serveru není ur�en"
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6888,58 +6922,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr "Pokus o vytvoření instanci jediná�ka"
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr "Předstírání spuštění příkazu (subprocess): %s"
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr "Předstíraný příkaz odpovídá %s"
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr "Předstíraný příkaz způsobil výjimku %s"
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr "Odpově� na předstíraný příkaz je stdout='%(stdout)s' stderr='%(stderr)s'"
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr "stav musí být dostupný"
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr "již připojeno"
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr "již odpojeno"
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr "Prosím rozšiřte nepravý modul libvirt aby podporoval příznaky"
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 #, fuzzy
 msgid "fake vswitch not found"
@@ -6976,18 +6994,18 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 #, fuzzy
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr "Překro�ena kvóta pro %(pid)s, pokus o spuštění %(min_count)s instancí"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6996,7 +7014,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr "Spouštění instancí: %s"
@@ -7013,16 +7031,16 @@ msgstr "Po ukon�ení instancí: %s"
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "Po vynuceném ukon�ení instancí: %s"
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 #, fuzzy
 msgid "spawn error"
 msgstr "neznámá chyby připojení hosta"
@@ -7122,6 +7140,22 @@ msgstr "Neo�ekávaný kód stavu"
 msgid "Decoding JSON: %s"
 msgstr "Dekódování JSON: %s"
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr "Prosím rozšiřte nepravý modul libvirt aby podporoval příznaky"
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -7146,11 +7180,11 @@ msgid "Loading compute driver '%s'"
 msgstr "Zaznamování ovlada�e svazku: %s"
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+#, fuzzy
+msgid "Unable to load the virtualization driver"
 msgstr "Nelze na�íst ovlada� virtualizace: %s"
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -7274,19 +7308,19 @@ msgstr "pozastavení není v vmwareapi popdorováno"
 msgid "ipmitool stdout: '%(out)s', stderr: '%(err)s'"
 msgstr "Odpově� na předstíraný příkaz je stdout='%(stdout)s' stderr='%(stderr)s'"
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7457,15 +7491,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7524,97 +7558,97 @@ msgstr "nenalezeny žádné oddíly"
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr "obraz již je připojen"
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, fuzzy, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr "Ignorování chyby při vkládání dat do obrazu %(img_id)s (%(e)s)"
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, fuzzy, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr "Nelze připojit souborový systém: %s"
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, fuzzy, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr "Nelze připojit souborový systém: %s"
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, fuzzy, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr "Ignorování chyby při vkládání dat do obrazu %(img_id)s (%(e)s)"
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7953,7 +7987,7 @@ msgstr "Verze agenta instance: %s"
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr "Aktualizace statistik hostitele"
@@ -7968,24 +8002,24 @@ msgstr "Získat výstup konzole pro instanci %s"
 msgid "Host IP address is: %s"
 msgstr "Uvolnit adresu %s"
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8319,12 +8353,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Přidělení plovoucí IP pro |%s|"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "Vkládání cesty souboru: '%s'"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "Vkládání cesty souboru: '%s'"
@@ -8490,7 +8524,7 @@ msgstr "Připojeni svazku: %(connection_info)s, %(instance_name)s, %(mountpoint)
 msgid "Detaching physical disk from instance: %s"
 msgstr "Vytváření snímku instance VM %s "
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr "Nelze zjistit název zavadě�e iscsi"
 
@@ -8558,213 +8592,213 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr "Připojování k libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr "Chyba od libvirt během ni�ení. Kód=%(errcode)s Chyba=%(e)s"
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 #, fuzzy
 msgid "During wait destroy, instance disappeared."
 msgstr "Při spuštění wait zmizelo %s."
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr "Instance úspěšně zni�ena."
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Instance budou zastaveny"
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr "Chyba od libvirt během rušení ur�ení. Kód=%(errcode)s Chyba=%(e)s"
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, fuzzy, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr "Chyba od libvirt během rušení ur�ení. Kód=%(errcode)s Chyba=%(e)s"
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr "Mazání souborů instance %(target)s"
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, fuzzy, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr "Nelze naplánovat_%(method)s: %(ex)s"
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 #, fuzzy
 msgid "Could not determine fibre channel world wide node names"
 msgstr "Nelze zjistit název zavadě�e iscsi"
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 #, fuzzy
 msgid "Could not determine fibre channel world wide port names"
 msgstr "Nelze zjistit název zavadě�e iscsi"
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 #, fuzzy
 msgid "During detach_volume, instance disappeared."
 msgstr "Při spuštění wait zmizelo %s."
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Źádné sítě nejsou ur�eny."
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 #, fuzzy
 msgid "During detach_interface, instance disappeared."
 msgstr "Při spuštění wait zmizelo %s."
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Źádné sítě nejsou ur�eny."
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "Instance úspěšně restartována."
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Nelze restartovat instanci"
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 #, fuzzy
 msgid "Instance shutdown successfully."
 msgstr "Instance úspěšně vytvořena."
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr "Instance úspěšně restartována."
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr "Instance je spuštěna"
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr "Instance úspěšně vytvořena."
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Uživatel nemá správcovská oprávnění"
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr "Vytváření obrazu"
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Vkládání %(injection)s do obrazu %(img_id)s"
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, fuzzy, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr "Ignorování chyby při vkládání dat do obrazu %(img_id)s (%(e)s)"
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8772,12 +8806,12 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -8786,27 +8820,27 @@ msgstr ""
 "Chyba od libvirt při hledání %(instance_name)s: [Kód chyby "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 #, fuzzy
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
@@ -8815,35 +8849,35 @@ msgstr ""
 "Nelze získat po�et cpu, protože tato funkce není na této platformě "
 "zavedena. Tuto chybu lze prozatím bezpe�ně ignorovat."
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "verze libvirt je příliš stará (nepodporuje getVersion)"
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Získávání velikosto brazu %s"
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8851,21 +8885,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -8874,16 +8908,16 @@ msgstr ""
 "Vytváření do�asného souboru %s pro informování ostatních po�íta�ových "
 "uzlů, že by se měli připojit ke stejnému úložišti."
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr "Přesunutí bloku nemůže být použito ve sdíleném úložišti."
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 #, fuzzy
 msgid "Live migration can not be used without shared storage."
 msgstr "Přesunutí bloku nemůže být použito ve sdíleném úložišti."
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
@@ -8892,7 +8926,7 @@ msgstr ""
 "Nelze přesunout %(instance_id)s do %(dest)s: Nedostatek disku  "
 "(hostitel:%(available)s <= instance:%(necessary)s)"
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -8901,7 +8935,7 @@ msgstr ""
 "Spuštěná instance má info o CPU:\n"
 "%s"
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8916,7 +8950,7 @@ msgstr ""
 "\n"
 "Prohlédněte si %(u)s"
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -8925,24 +8959,24 @@ msgstr ""
 "Vytváření do�asného souboru %s pro informování ostatních po�íta�ových "
 "uzlů, že by se měli připojit ke stejnému úložišti."
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "Přesun před spuštěním selhal na %(dest)s"
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, fuzzy, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 "plug_vifs() selhalo %(cnt)d.opakování až na %(max_retry)d pro "
 "%(hostname)s."
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, fuzzy, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
@@ -8951,42 +8985,42 @@ msgstr ""
 "Chyba od libvirt při hledání %(instance_name)s: [Kód chyby "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr "přeskakování %(path)s protože vypadá jako svazek"
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 #, fuzzy
 msgid "Starting migrate_disk_and_power_off"
 msgstr "Instance %s: Spouštění přesunu disku a vypnutí"
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 #, fuzzy
 msgid "Instance running successfully."
 msgstr "Instance %s úspěšně běží."
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 #, fuzzy
 msgid "Starting finish_migration"
 msgstr "Instance %s: Spouštění dokon�ení přesunu"
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 #, fuzzy
 msgid "Starting finish_revert_migration"
 msgstr "Instance %s: Spuštění doko�ení vrácení přesunu"
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, fuzzy, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr "Mazání souborů instance %(target)s"
@@ -9021,46 +9055,46 @@ msgstr "Nwfilter (%(instance_filter_name)s) pro %(name)s nenalezen."
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptables firewall: Nastavení základního filtrování"
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, fuzzy, python-format
 msgid "Unknown image_type=%s"
 msgstr "neznámá obslužná rutina obrazu disku: %s"
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, fuzzy, python-format
 msgid "Reading image info file: %s"
 msgstr "Odstraňování základního souboru: %s"
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, fuzzy, python-format
 msgid "Writing stored info to %s"
 msgstr "Odstraňování základního souboru: %s"
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr "%s je platný název instance"
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr "%s má soubor disku"
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr "Instance %(instance)s je zálohována %(backing)s"
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
@@ -9069,12 +9103,12 @@ msgstr ""
 "Instance %(instance)s používá soubor zálohy %(backing)s, který se "
 "neobjevuje ve službě obrazu"
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, fuzzy, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr "%(container_format)s-%(id)s (%(base_file)s):ověření obrazu selhalo"
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, fuzzy, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
@@ -9083,37 +9117,37 @@ msgstr ""
 "%(container_format)s-%(id)s (%(base_file)s): ověření obrazu přesko�eno, "
 "žádný hash neuložen"
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr "%(container_format)s-%(id)s (%(base_file)s): kontrolování"
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, fuzzy, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr "Nelze odstranit %(base_file)s, chyba byla %(error)s"
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr "Základní souboru je příliš nový k odstranění: %s"
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr "Odstraňování základního souboru: %s"
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr "Nelze odstranit %(base_file)s, chyba byla %(error)s"
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, fuzzy, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr "%(container_format)s-%(id)s (%(base_file)s): kontrolování"
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, fuzzy, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
@@ -9122,7 +9156,7 @@ msgstr ""
 "%(container_format)s-%(id)s (%(base_file)s): je používáno: v tomto uzlu "
 "%(local)d local, %(remote)d v ostatních uzlech"
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, fuzzy, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
@@ -9131,51 +9165,51 @@ msgstr ""
 "%(container_format)s-%(id)s (%(base_file)s): varování -- je používán "
 "chybějící základní soubor! instance: %(instance_list)s"
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, fuzzy, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr "%(container_format)s-%(id)s (%(base_file)s): obraz není používán"
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, fuzzy, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr "%(container_format)s-%(id)s (%(base_file)s): obraz je používán"
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr "Přeskakování oěření, žádný základní adresář v %s"
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr "Ověřit základní obrazy"
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr "Neznámý základní soubor: %s"
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr "Aktivní základní soubory: %s"
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr "Poškozené základní soubory: %s"
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr "Odstranitelné základní soubory: %s"
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr "Ověření dokon�eno"
 
@@ -9289,12 +9323,12 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr "iSCSI zařízení v %s nenalezeno"
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, fuzzy, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
@@ -9303,48 +9337,48 @@ msgstr ""
 "ISCSI svazek zatím v %(mount_device)s nenalezen:. Bude znovu provedeno "
 "hledání a další pokus. Číslo pokusu: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, fuzzy, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr "Nalezen uzel iSCSI %(mount_device)s (po %(tries)s pokusech)"
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, fuzzy, python-format
 msgid "%s is already mounted"
 msgstr "obraz již je připojen"
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, fuzzy, python-format
 msgid "AoE device not found at %s"
 msgstr "iSCSI zařízení v %s nenalezeno"
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, fuzzy, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 "ISCSI svazek zatím v %(mount_device)s nenalezen:. Bude znovu provedeno "
 "hledání a další pokus. Číslo pokusu: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, fuzzy, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr "Nalezen uzel iSCSI %(mount_device)s (po %(tries)s pokusech)"
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 #, fuzzy
 msgid "Fibre Channel device not found."
 msgstr "iSCSI zařízení v %s nenalezeno"
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, fuzzy, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
@@ -9353,30 +9387,30 @@ msgstr ""
 "ISCSI svazek zatím v %(mount_device)s nenalezen:. Bude znovu provedeno "
 "hledání a další pokus. Číslo pokusu: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, fuzzy, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr "Nalezen uzel iSCSI %(mount_device)s (po %(tries)s pokusech)"
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9450,36 +9484,36 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 #, fuzzy
 msgid "Connection error connecting PowerVM manager"
 msgstr "Chyba připojení během kontaktování serveru glance, další pokus"
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, fuzzy, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr "Spouštění příkazu (podproces): %s"
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 #, fuzzy
 msgid "File transfer from PowerVM manager failed"
 msgstr "Připojení k melange selhalo"
@@ -9572,74 +9606,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, fuzzy, python-format
 msgid "LPAR instance '%s' not found"
 msgstr "Instance nenalezena"
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, fuzzy, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr "Odstraňování základního souboru: %s"
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, fuzzy, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr "Získávání seznamu instancí"
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, fuzzy, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr "instance %s: Vytváření obrazu"
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, fuzzy, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr "Instance budou spuštěny"
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, fuzzy, python-format
 msgid "Instance '%s' failed to boot"
 msgstr "instance %s: znovu zavedena"
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, fuzzy, python-format
 msgid "Instance spawned in %s seconds"
 msgstr "instance %s úspěšn spuštěna"
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, fuzzy, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr "instance %s: pořizování snímku"
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, fuzzy, python-format
 msgid "Shutting down the instance '%s'"
 msgstr "Zapínání instance VM %s"
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, fuzzy, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr "Instance budou spuštěny"
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -10153,7 +10187,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -10321,14 +10355,14 @@ msgstr "Nelze najít svazek v db"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Bod připojení %(mountpoint)s odpojen od instance %(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, fuzzy, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 "ČASOV� LIMIT: Vypršel �as volání %(method)s. VM id=%(instance_uuid)s; "
 "arg=%(args)r"
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, fuzzy, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -10337,7 +10371,7 @@ msgstr ""
 "NEZAVEDENO: Volání %(method)s není agentem podporováno. VM "
 "id=%(instance_uuid)s; arg=%(args)r"
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, fuzzy, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr "Volání %(method)s vrátilo chybu: %(e)s."
@@ -10450,24 +10484,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Nelze dešifrovat soukromý klí�: %s"
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr "Spuštění hostitele na XenServer není podporováno."
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr "Nelze se přihlásit do XenAPI (je disk Dom0 plný?)"
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr "Obdržena výjimka: %s"
@@ -10607,74 +10641,74 @@ msgstr ""
 "PIF %(pif_rec['uuid'])s pro síť %(bridge)s má id VLAN %(pif_vlan)d. "
 "O�ekáváno %(vlan_num)d"
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 #, fuzzy
 msgid "Created VM"
 msgstr "_vytvořit: %s"
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 #, fuzzy
 msgid "VM already halted, skipping shutdown..."
 msgstr "VM %(instance_uuid)s již je zastavena, přeskakování vypnutí..."
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD v instanci %s nenalezeno"
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "již odpojeno"
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Nelze odpojit VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Nelze zni�it VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Vytvořeno VBD %(vbd_ref)s pro VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Vytvořeno VBD %(vbd_ref)s pro VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr "Nelze zni�it VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -10683,37 +10717,37 @@ msgstr ""
 "Vytvořeno VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, "
 "%(read_only)s) na %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 #, fuzzy
 msgid "SR not present and could not be introduced"
 msgstr "Instance nemohla být nalezena"
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, fuzzy, python-format
 msgid "block device info: %s"
 msgstr "block_device_list %s"
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr "Zkopírováno VDI %(vdi_ref)s z VDI %(vdi_to_clone_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, fuzzy, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr "Nenalezeno žádné hlavní VDI pro %(vm_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "Spouštění snímku ve VM %s"
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
@@ -10722,49 +10756,49 @@ msgstr ""
 "Rychlé kopírování je podporováno pouze na výchozím místním SR typu ext. "
 "SR na tomto systému je typu %(sr_type)s. Ignorování příznaku cow."
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, fuzzy, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr "xapi 'download_vhd' vrátil VDI typu '%(vdi_type)s' s UUID '%(vdi_uuid)s'"
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, fuzzy, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr "Žádání xapi o získání obrazu vhd %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
@@ -10773,17 +10807,17 @@ msgstr ""
 "Velkost %(size_bytes) obrazu překra�uje povolenou velikost "
 "%(allowed_size_bytes)d typu instance"
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "Získávání obrazu %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Velikost obrazu %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
@@ -10792,64 +10826,64 @@ msgstr ""
 "Obraz Kernel/Ramdisk je příliš velký: %(vdi_size)d bajtů, max "
 "%(max_size)d bajtů"
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Kopírování VDI %s do /boot/guest na dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s zni�eno"
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "instance %s: nelze získat obraz glance"
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr "Zjištěn formát %(image_type_str)s obrazu %(image_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Hledání vdi %s pro kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr "Neznámý formát obrazu %(disk_image_type)s"
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s je stále dostupné"
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Znovu skenování SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr "Příznak sr_matching_filter '%s' se neřídí pravidly formátování"
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
@@ -10858,50 +10892,50 @@ msgstr ""
 "XenAPI nelze najít úložiště na které nainstalovat instance hostů. Prosím "
 "zkontrolujte Vaše nastavení a/nebo nastavte příznak 'sr_matching_filter'"
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr "Nelze najít SR typu obsahu ISO"
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr "ISO: hledání SR %(sr_rec)s"
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr "ISO: není obsah iso"
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr "ISO: typ obsahu iso, není klí� 'i18n-key'"
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr "ISO: typ obsahu iso, hodnota i18n-key není 'local-storage-iso'"
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr "ISO: SR odpovídající naším kritériím"
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr "ISO: ISO, prozkoumáváno, zdali se jedná o místního hostitele"
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr "ISO: PBD %(pbd_ref)s zmizelo"
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr "ISO: shoda PBD, požadováno %(pbd_rec)s, získáno %(host)s"
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr "ISO: SR s místním PBD"
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
@@ -10910,22 +10944,22 @@ msgstr ""
 "Nelze získat RRD XML pro VM %(vm_uuid)s mající podrobnosti serveru: "
 "%(server)s."
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr "Nelze získat aktualizace RRD XML s podrobnostmi serveru: %(server)s."
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr "Neznámá data statistik od Xenserver: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s má nadřazenho %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -10934,66 +10968,66 @@ msgstr ""
 "Nadřazený %(parent_uuid)s se neshoduje s původním nadřazeným "
 "%(original_parent_uuid)s, �ekání na splynutí..."
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr "Překro�eny pokusy o splynutí VHD (%(max_attempts)d), přerušeno..."
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "Vypršel �asový limit při �ekání na vytvoření zařízení %s"
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Zapojování VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Zapojování VBD %s hotovo."
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr "VBD %(vbd_ref)s zapojeno jako %(orig_dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr "VBD %(vbd_ref)s zapojeno do špatného dev, znovu mapování do %(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Ni�ení VBD pro VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Ni�ení VBD pro VDI %s hotovo."
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Spouštění pygrub s %s"
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Nalezen kernel Xen %s"
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Žádný kernel Xen nenalezen. Zavádění HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11001,16 +11035,16 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr "Oddíly:"
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d sektorů"
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
@@ -11019,39 +11053,46 @@ msgstr ""
 "Zapisování tabulky oddílů %(primary_first)d %(primary_last)d do "
 "%(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Zapisování tabulky oddílů %s dokon�eno."
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr "Přímé zacházení se soubory rozhraní"
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr "Nelze připojit souborový systém (o�ekáváno v nelinuxových instancích): %s"
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, fuzzy, python-format
 msgid "Updating progress to %(progress)d"
 msgstr "Aktualizace postupu instance '%(instance_uuid)s' na %(progress)d"
@@ -11065,213 +11106,223 @@ msgstr "Odstraňování základního souboru: %s"
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 #, fuzzy
 msgid "Starting instance"
 msgstr "Spouštění instance..."
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr "Odstraňování souborů kernel/ramdisku z dom0"
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, fuzzy, python-format
 msgid "Block device information present: %s"
 msgstr "block_device_mapping %s"
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Nelze aktualizovat svazek v db"
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 #, fuzzy
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 "Automatické nastavení disku pro instanci %(instance_uuid)s, pokus o změnu"
 " velikosti oddílu..."
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 #, fuzzy
 msgid "Starting VM"
 msgstr "Restartování xvp"
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr "Psled v agenta pro %(hypervisor)s/%(os)s/%(architecture)s je %(version)s"
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr "Nenalezena žádná verze agenta pro %(hypervisor)s/%(os)s/%(architecture)s"
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr "Verze agenta instance: %s"
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr "Nastavování váhy VCPU"
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, fuzzy, python-format
 msgid "Could not find VM with name %s"
 msgstr "Nelze najít odkaz na VDI"
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "Dokon�en snímek a nahrání na VM %s"
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr "Nelze převést vhd na nového hostitele"
 
-#: nova/virt/xenapi/vmops.py:813
-#, fuzzy, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
-msgstr "Zmenšení velikosti VDI %(cow_uuid)s z %(old_gb)d GB na %(new_gb)d GB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+#, fuzzy
+msgid "Unable to terminate instance."
+msgstr "Nelze restartovat instanci"
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "Zvětšení velikosti VDI %(vdi_uuid)s z%(old_gb)d GB na %(new_gb)d GB"
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 #, fuzzy
 msgid "Resize complete"
 msgstr "Změna velikosti %s je hotova"
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 #, fuzzy
 msgid "Unable to find root VBD/VDI for VM"
 msgstr "Neůze najít vbd pro vdi %s"
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 #, fuzzy
 msgid "Destroying VDIs"
 msgstr "Restartování xvp"
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 #, fuzzy
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 "Instance %(instance_uuid)s pomocí RAW nebo VHD, přeskakování mazání "
 "kernelu a ramdisku"
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr "Instance mí kernel nebo ramdisk, ale ne oba"
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr "soubory kernel/ramdisk odstraněny"
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 #, fuzzy
 msgid "Destroying VM"
 msgstr "Restartování xvp"
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr "VM není přítomno, přeskakování ni�ení..."
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr "Instance již je v záchranném režimu: %s"
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 #, fuzzy
 msgid "VM is not present, skipping soft delete..."
 msgstr "VM není přítomno, přeskakování ni�ení..."
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 #, fuzzy
 msgid "Automatically hard rebooting"
 msgstr "Automatický tvrdý restart %d"
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "Vkládání informací o síti do xs pro vm: |%s|"
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 #, fuzzy
 msgid "Creating vifs"
 msgstr "Vytváření obrazu"
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "vytváření VIF pro VM %(vm_ref)s, síť %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "vytváření VIF pro VM %(vm_ref)s, síť %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 #, fuzzy
 msgid "Injecting hostname to xenstore"
 msgstr "Vkládání názvu hostitele do xs pro vm: |%s|"
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 #, fuzzy
 msgid "No suitable network for migrate"
 msgstr "Špatný formát sítě"
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 #, fuzzy
 msgid "Migrate Send failed"
 msgstr "Vytvoření selhalo"
@@ -11402,18 +11453,27 @@ msgstr "Neo�ekávaná chyba: %s"
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr "Spouštění uzlu nova-xvpvncproxy (verze %s)"
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 #, fuzzy
 msgid "status must be 'in-use'"
 msgstr "stav musí být dostupný"
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 #, fuzzy
 msgid "status must be 'available'"
 msgstr "stav musí být dostupný"
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr "%(flag)s : SADA PŽ�ZNAKŮ "
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr "Přesun nenalezen v instanci %(instance_id)s se stavem %(status)s."
+
diff --git a/nova/locale/da/LC_MESSAGES/nova.po b/nova/locale/da/LC_MESSAGES/nova.po
index 6d520985e..7b362cd8e 100644
--- a/nova/locale/da/LC_MESSAGES/nova.po
+++ b/nova/locale/da/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+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"
@@ -83,7 +83,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -167,8 +167,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -198,7 +198,7 @@ msgstr ""
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
@@ -1234,55 +1234,67 @@ msgstr ""
 
 #: nova/exception.py:1157
 #, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1293,7 +1305,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1313,205 +1325,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-msgid "Full set of CONF:"
-msgstr ""
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, python-format
-msgid "Starting %d workers"
-msgstr ""
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1596,130 +1528,125 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
@@ -1729,69 +1656,74 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, python-format
+msgid "Invalid IP protocol %s."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
@@ -1800,7 +1732,7 @@ msgstr ""
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
@@ -1810,7 +1742,7 @@ msgid "Detach Volume Failed."
 msgstr ""
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
@@ -1842,137 +1774,137 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2012,11 +1944,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr ""
@@ -2035,19 +1967,19 @@ msgstr ""
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -2059,63 +1991,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:364
+#: nova/api/openstack/common.py:366
 #, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -2169,14 +2101,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
 #: nova/api/openstack/extensions.py:370
 #, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2219,13 +2151,13 @@ msgstr ""
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr ""
 
@@ -2234,20 +2166,20 @@ msgstr ""
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, python-format
 msgid "Calling method %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2260,12 +2192,12 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2273,17 +2205,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2348,210 +2280,210 @@ msgstr ""
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, python-format
 msgid "Flavor '%s' could not be found "
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2559,9 +2491,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
+#: nova/api/openstack/compute/servers.py:1408
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+msgid "Removing options '%s' from query"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2648,7 +2580,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2668,17 +2600,17 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2830,15 +2762,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
@@ -2946,7 +2878,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -2979,29 +2911,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3220,33 +3152,33 @@ msgstr ""
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, python-format
 msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3265,94 +3197,93 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:838
-#, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+#: nova/cells/messaging.py:862
+msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3369,7 +3300,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3383,7 +3314,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3409,7 +3340,7 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, python-format
 msgid "Failed to load %s"
 msgstr ""
@@ -3429,270 +3360,270 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3772,242 +3703,242 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4041,714 +3972,719 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, python-format
 msgid "Host %(host)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -4858,7 +4794,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -4869,7 +4805,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -4947,54 +4883,50 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5011,51 +4943,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5140,15 +5072,19 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 msgid "Failed storing info cache"
 msgstr ""
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -5262,103 +5198,103 @@ msgstr ""
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5453,38 +5389,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5519,7 +5455,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5601,65 +5537,65 @@ msgstr ""
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5676,27 +5612,27 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5706,17 +5642,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5789,11 +5725,91 @@ msgstr ""
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+msgid "Full set of CONF:"
+msgstr ""
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr ""
@@ -5932,57 +5948,62 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -6296,7 +6317,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6305,36 +6326,48 @@ msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:357
+#: nova/scheduler/filter_scheduler.py:361
 #, python-format
-msgid "Choosing host %(chosen_host)s"
+msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6529,46 +6562,46 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 msgid "memcached_servers not defined"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6621,58 +6654,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr ""
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 msgid "fake vswitch not found"
 msgstr ""
@@ -6706,17 +6723,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6725,7 +6742,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
@@ -6742,16 +6759,16 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 msgid "spawn error"
 msgstr ""
 
@@ -6847,6 +6864,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -6871,11 +6904,10 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -6995,19 +7027,19 @@ msgstr ""
 msgid "ipmitool stdout: '%(out)s', stderr: '%(err)s'"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7175,15 +7207,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7241,97 +7273,97 @@ msgstr ""
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7665,7 +7697,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7679,24 +7711,24 @@ msgstr ""
 msgid "Host IP address is: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8017,12 +8049,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8180,7 +8212,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8248,202 +8280,202 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "bind %s: slettet"
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8451,73 +8483,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8525,50 +8557,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8578,67 +8610,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8671,153 +8703,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, python-format
 msgid "Writing stored info to %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -8930,87 +8962,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9082,35 +9114,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
@@ -9201,74 +9233,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, python-format
 msgid "LPAR instance '%s' not found"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, python-format
 msgid "Instance '%s' failed to boot"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, python-format
 msgid "Shutting down the instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9724,7 +9756,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -9882,19 +9914,19 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -9998,24 +10030,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -10152,374 +10184,374 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10527,55 +10559,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -10589,193 +10628,202 @@ msgstr ""
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+msgid "Unable to terminate instance."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -10903,16 +10951,28 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 msgid "status must be 'in-use'"
 msgstr ""
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr ""
+
+#~ msgid "Got update to delete instance %(instance_uuid)s"
+#~ msgstr ""
+
diff --git a/nova/locale/de/LC_MESSAGES/nova.po b/nova/locale/de/LC_MESSAGES/nova.po
index 7ed7e62f6..a89d5f347 100644
--- a/nova/locale/de/LC_MESSAGES/nova.po
+++ b/nova/locale/de/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+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"
@@ -83,7 +83,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -167,8 +167,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -198,7 +198,7 @@ msgstr ""
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
@@ -1235,55 +1235,67 @@ msgstr ""
 
 #: nova/exception.py:1157
 #, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1294,7 +1306,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1314,206 +1326,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-#, fuzzy
-msgid "Full set of CONF:"
-msgstr "Alle vorhandenen FLAGS:"
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, python-format
-msgid "Starting %d workers"
-msgstr ""
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr "Ergebnis war %s"
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1598,130 +1529,125 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
@@ -1731,69 +1657,74 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, python-format
+msgid "Invalid IP protocol %s."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
@@ -1802,7 +1733,7 @@ msgstr ""
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
@@ -1812,7 +1743,7 @@ msgid "Detach Volume Failed."
 msgstr ""
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
@@ -1844,138 +1775,138 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "Instanz %s: Rettung"
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2015,11 +1946,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, fuzzy, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
@@ -2038,19 +1969,19 @@ msgstr ""
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -2062,63 +1993,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:364
+#: nova/api/openstack/common.py:366
 #, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -2172,14 +2103,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
 #: nova/api/openstack/extensions.py:370
 #, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2222,13 +2153,13 @@ msgstr ""
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr ""
 
@@ -2237,20 +2168,20 @@ msgstr ""
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, python-format
 msgid "Calling method %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2263,12 +2194,12 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2276,17 +2207,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2351,210 +2282,210 @@ msgstr ""
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, python-format
 msgid "Flavor '%s' could not be found "
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2562,9 +2493,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
+#: nova/api/openstack/compute/servers.py:1408
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+msgid "Removing options '%s' from query"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2651,7 +2582,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2671,17 +2602,17 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2835,15 +2766,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
@@ -2952,7 +2883,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -2985,29 +2916,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3226,33 +3157,33 @@ msgstr ""
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, python-format
 msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3271,94 +3202,94 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, fuzzy, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+msgid "Got update for instance: %(instance)s"
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
-#: nova/cells/messaging.py:838
+#: nova/cells/messaging.py:862
 #, fuzzy, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+msgid "Got update to delete instance"
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3375,7 +3306,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3389,7 +3320,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3415,7 +3346,7 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, fuzzy, python-format
 msgid "Failed to load %s"
 msgstr "Nicht möglich volume %s zufinden"
@@ -3435,270 +3366,270 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3779,243 +3710,243 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4049,721 +3980,726 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Volume %s: erstelle Export"
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "Instanz %s: Rettung"
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instanz %s: Rettung"
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, fuzzy, python-format
 msgid "Host %(host)s not found"
 msgstr "Instanz %s pausiert"
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "Instanz %s: Rettung"
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -4873,7 +4809,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -4884,7 +4820,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -4962,54 +4898,50 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5026,51 +4958,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5155,15 +5087,19 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 msgid "Failed storing info cache"
 msgstr ""
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -5277,103 +5213,103 @@ msgstr ""
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5468,38 +5404,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5534,7 +5470,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5617,65 +5553,65 @@ msgstr ""
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5692,27 +5628,27 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5722,17 +5658,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5805,11 +5741,92 @@ msgstr ""
 msgid "Running cmd (subprocess): %s"
 msgstr "Führe Kommando (subprocess) aus: %s"
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr "Ergebnis war %s"
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+#, fuzzy
+msgid "Full set of CONF:"
+msgstr "Alle vorhandenen FLAGS:"
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr ""
@@ -5948,57 +5965,62 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -6312,7 +6334,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6321,36 +6343,48 @@ msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, fuzzy, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:357
+#: nova/scheduler/filter_scheduler.py:361
 #, python-format
-msgid "Choosing host %(chosen_host)s"
+msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6545,46 +6579,46 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 msgid "memcached_servers not defined"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6637,58 +6671,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr ""
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 msgid "fake vswitch not found"
 msgstr ""
@@ -6722,17 +6740,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6741,7 +6759,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
@@ -6758,16 +6776,16 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 msgid "spawn error"
 msgstr ""
 
@@ -6863,6 +6881,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -6887,11 +6921,10 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -7016,19 +7049,19 @@ msgstr ""
 "Stdout: %(stdout)r\n"
 "Stderr: %(stderr)r"
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7196,15 +7229,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7262,97 +7295,97 @@ msgstr ""
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7686,7 +7719,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7700,24 +7733,24 @@ msgstr ""
 msgid "Host IP address is: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8038,12 +8071,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8203,7 +8236,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8271,202 +8304,202 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "Volume %s: erfolgreich erstellt"
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8474,73 +8507,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8548,50 +8581,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8601,67 +8634,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8694,153 +8727,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, python-format
 msgid "Writing stored info to %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -8953,87 +8986,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9105,35 +9138,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, fuzzy, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr "Führe Kommando (subprocess) aus: %s"
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
@@ -9224,74 +9257,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, fuzzy, python-format
 msgid "LPAR instance '%s' not found"
 msgstr "Instanz %s pausiert"
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, python-format
 msgid "Instance '%s' failed to boot"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, fuzzy, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr "Instanz %s: Rettung"
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, python-format
 msgid "Shutting down the instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9748,7 +9781,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -9908,19 +9941,19 @@ msgstr "Nicht möglich volume %s zufinden"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -10024,24 +10057,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -10178,374 +10211,374 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10553,55 +10586,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -10615,193 +10655,203 @@ msgstr ""
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+#, fuzzy
+msgid "Unable to terminate instance."
+msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -10930,16 +10980,25 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 msgid "status must be 'in-use'"
 msgstr ""
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
+
diff --git a/nova/locale/en_AU/LC_MESSAGES/nova.po b/nova/locale/en_AU/LC_MESSAGES/nova.po
index 0f2c086f5..172b7374d 100644
--- a/nova/locale/en_AU/LC_MESSAGES/nova.po
+++ b/nova/locale/en_AU/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+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"
@@ -84,7 +84,7 @@ msgstr "Flags path: %s"
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -168,8 +168,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -200,7 +200,7 @@ msgstr "Invalid signature for user %s"
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
@@ -1240,55 +1240,67 @@ msgstr ""
 
 #: nova/exception.py:1157
 #, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "instance %s: booted"
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "instance %s: booted"
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1299,7 +1311,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1320,205 +1332,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-msgid "Full set of CONF:"
-msgstr ""
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, fuzzy, python-format
-msgid "Starting %d workers"
-msgstr "start address"
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, fuzzy, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr "Starting %(topic)s node (version %(vcs_string)s)"
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "Service killed that has no database entry"
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr "Running cmd (SSH): %s"
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr "Result was %s"
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1603,7 +1535,7 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr "Too many failed authentications."
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
@@ -1612,124 +1544,119 @@ msgstr ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "Authentication Failure: %s"
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "Too many failed authentications."
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr "action: %s"
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\tval: %(value)s"
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "Unauthorised request for controller=%(controller)s and action=%(action)s"
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "InstanceNotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "VolumeNotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "NotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "Unexpected error raised: %s"
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Unexpected error raised: %s"
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "An unknown error has occurred. Please try your request again."
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "Unsupported API request: controller = %(controller)s, action = %(action)s"
@@ -1739,69 +1666,74 @@ msgstr "Unsupported API request: controller = %(controller)s, action = %(action)
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "Failed to decrypt private key: %s"
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr "Create key pair %s"
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Delete key pair %s"
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "Not enough parameters to build a valid rule."
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, python-format
+msgid "Invalid IP protocol %s."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr "No rule for the specified parameters."
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "This rule already exists in group %s"
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Create volume of %s GB"
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
@@ -1810,7 +1742,7 @@ msgstr "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Detach volume %s"
@@ -1821,7 +1753,7 @@ msgid "Detach Volume Failed."
 msgstr "Detach volume %s"
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "attribute not supported: %s"
@@ -1853,140 +1785,140 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Disassociate address %s"
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Disassociate address %s"
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Disassociate address %s"
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr "Going to start terminating instances"
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reboot instance %r"
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr "De-registering image %s"
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Registered image %(image_location)s with id %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr "user or group not specified"
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr "only group \"all\" is supported"
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr "operation_type must be add or remove"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Updating image %s publicity"
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance %s: rescued"
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2026,11 +1958,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, fuzzy, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr "Failed to get metadata for ip: %s"
@@ -2049,19 +1981,19 @@ msgstr ""
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -2073,63 +2005,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:364
+#: nova/api/openstack/common.py:366
 #, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -2183,14 +2115,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
 #: nova/api/openstack/extensions.py:370
 #, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2233,13 +2165,13 @@ msgstr ""
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr ""
 
@@ -2248,20 +2180,20 @@ msgstr ""
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, fuzzy, python-format
 msgid "Calling method %s"
 msgstr "Calling getter %s"
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2274,12 +2206,12 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2287,17 +2219,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, fuzzy, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr "Invalid signature for user %s"
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, fuzzy, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr "Invalid signature for user %s"
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2362,214 +2294,214 @@ msgstr ""
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 #, fuzzy
 msgid "Only administrators may list deleted instances"
 msgstr "Going to try to terminate %s"
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, python-format
 msgid "Flavor '%s' could not be found "
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "Mountpoint cannot be translated: %s"
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "Mountpoint cannot be translated: %s"
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Going to start terminating instances"
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2577,9 +2509,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
+#: nova/api/openstack/compute/servers.py:1408
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+msgid "Removing options '%s' from query"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2666,7 +2598,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2686,17 +2618,17 @@ msgstr "compute.api::resume %s"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2854,15 +2786,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
@@ -2972,7 +2904,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3006,29 +2938,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Calling getter %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Calling getter %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3253,33 +3185,33 @@ msgstr ""
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, fuzzy, python-format
 msgid "Instance %s is not attached."
 msgstr "instance %s: booted"
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3298,94 +3230,94 @@ msgstr "Release address %s"
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "no method for message: %s"
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "no method for message: %s"
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, fuzzy, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+msgid "Got update for instance: %(instance)s"
 msgstr "Going to start terminating instances"
 
-#: nova/cells/messaging.py:838
+#: nova/cells/messaging.py:862
 #, fuzzy, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+msgid "Got update to delete instance"
 msgstr "Going to start terminating instances"
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3402,7 +3334,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
@@ -3416,7 +3348,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3443,7 +3375,7 @@ msgstr "Netmask to push into openvpn config"
 msgid "Launching VPN for %s"
 msgstr "Launching VPN for %s"
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, fuzzy, python-format
 msgid "Failed to load %s"
 msgstr "Unable to locate volume %s"
@@ -3463,277 +3395,277 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 #, fuzzy
 msgid "Reserved"
 msgstr "received %s"
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Caught error: %s"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 #, fuzzy
 msgid "network"
 msgstr "setting network host"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 #, fuzzy
 msgid "IP address"
 msgstr "start address"
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "group %s already exists"
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "start address"
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 #, fuzzy
 msgid "No networks found"
 msgstr "setting network host"
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 #, fuzzy
 msgid "instance"
 msgstr "Reboot instance %r"
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "Unexpected error raised: %s"
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3814,251 +3746,251 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr "Instance quota exceeded. You can only run %s more instances of this type."
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "Instance quota exceeded. You can only run %s more instances of this type."
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Going to run %s instances..."
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "instance %s: booted"
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Starting snapshot for VM %s"
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group %s"
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group %s"
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorise security group ingress %s"
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4093,734 +4025,739 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Unexpected error raised: %s"
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Caught error: %s"
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Detach volume %s"
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "Running instances: %s"
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: rebooted"
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, fuzzy, python-format
 msgid "injecting file to %(path)s"
 msgstr "Injecting file path: '%s'"
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Caught error: %s"
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instance %s: unrescuing"
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: retrieving diagnostics"
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 #, fuzzy
 msgid "Reset network"
 msgstr "setting network host"
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 #, fuzzy
 msgid "Inject network info"
 msgstr "setting network host"
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 #, fuzzy
 msgid "Get console output"
 msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Adding console"
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Adding console"
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance %s"
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, fuzzy, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr "instance %s: booted"
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, fuzzy, python-format
 msgid "Host %(host)s not found"
 msgstr "instance %s: booted"
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Failed to get metadata for ip: %s"
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Deleting user %s"
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instance %s: booted"
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Deleting user %s"
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -4930,7 +4867,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -4941,7 +4878,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5020,54 +4957,50 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5084,51 +5017,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5213,16 +5146,20 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 #, fuzzy
 msgid "Failed storing info cache"
 msgstr "Going to start terminating instances"
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, fuzzy, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
@@ -5336,103 +5273,103 @@ msgstr ""
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, fuzzy, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr "Pid %d is stale, relaunching dnsmasq"
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Hupping dnsmasq threw %s"
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d is stale, relaunching dnsmasq"
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "killing radvd threw %s"
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d is stale, relaunching radvd"
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "Invalid backend: %s"
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Starting VLAN interface %s"
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Failed to decrypt private key: %s"
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Starting Bridge interface for %s"
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Error starting xvp: %s"
@@ -5527,32 +5464,32 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
@@ -5560,7 +5497,7 @@ msgstr ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5596,7 +5533,7 @@ msgstr "received %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5679,68 +5616,68 @@ msgstr "setting network host"
 msgid "Quantum Error creating security group %s"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Caught error: %s"
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Revoke security group ingress %s"
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Caught error: %s"
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Authorise security group ingress %s"
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5757,27 +5694,27 @@ msgstr "This rule already exists in group %s"
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5787,17 +5724,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr "received %s"
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5870,11 +5807,91 @@ msgstr ""
 msgid "Running cmd (subprocess): %s"
 msgstr "Running cmd (subprocess): %s"
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr "Result was %s"
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr "Running cmd (SSH): %s"
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+msgid "Full set of CONF:"
+msgstr ""
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, fuzzy, python-format
+msgid "Starting %d workers"
+msgstr "start address"
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr ""
@@ -6013,57 +6030,62 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Returning exception %s to caller"
@@ -6382,7 +6404,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6391,36 +6413,48 @@ msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, fuzzy, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr "Going to start terminating instances"
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:357
+#: nova/scheduler/filter_scheduler.py:361
 #, python-format
-msgid "Choosing host %(chosen_host)s"
+msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6615,46 +6649,46 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr "Recovered model server connection!"
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr "model server went away"
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 msgid "memcached_servers not defined"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6707,58 +6741,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr "Attempted to instantiate singleton"
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 #, fuzzy
 msgid "fake vswitch not found"
@@ -6793,17 +6811,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6812,7 +6830,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr "Running instances: %s"
@@ -6829,16 +6847,16 @@ msgstr "After terminating instances: %s"
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 msgid "spawn error"
 msgstr ""
 
@@ -6934,6 +6952,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -6958,11 +6992,10 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -7087,19 +7120,19 @@ msgstr ""
 "Stdout: %(stdout)r\n"
 "Stderr: %(stderr)r"
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7267,15 +7300,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7333,101 +7366,101 @@ msgstr ""
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, fuzzy, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, fuzzy, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr "Failed to mount filesystem: %s"
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, fuzzy, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr "Failed to mount filesystem: %s"
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, fuzzy, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7763,7 +7796,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7778,24 +7811,24 @@ msgstr "Get console output for instance %s"
 msgid "Host IP address is: %s"
 msgstr "Release address %s"
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8119,12 +8152,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Going to start terminating instances"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "Injecting file path: '%s'"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "Injecting file path: '%s'"
@@ -8290,7 +8323,7 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Creating a raw instance"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8358,205 +8391,205 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Going to try to terminate %s"
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "instance %s: rebooted"
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, fuzzy, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8564,73 +8597,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Failed to get metadata for ip: %s"
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8638,50 +8671,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8691,67 +8724,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "Authentication Failure: %s"
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8784,153 +8817,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, fuzzy, python-format
 msgid "Writing stored info to %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -9043,87 +9076,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, fuzzy, python-format
 msgid "%s is already mounted"
 msgstr "group %s already exists"
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9196,35 +9229,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, fuzzy, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr "Running cmd (subprocess): %s"
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
@@ -9315,74 +9348,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, fuzzy, python-format
 msgid "LPAR instance '%s' not found"
 msgstr "instance %s: booted"
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, fuzzy, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, fuzzy, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr "Creating a raw instance"
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, fuzzy, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr "instance %s: Creating image"
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, fuzzy, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr "Creating a raw instance"
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, fuzzy, python-format
 msgid "Instance '%s' failed to boot"
 msgstr "instance %s: rebooted"
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, fuzzy, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr "instance %s: snapshotting"
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, fuzzy, python-format
 msgid "Shutting down the instance '%s'"
 msgstr "Going to run %s instances..."
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, fuzzy, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr "Going to run %s instances..."
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9845,7 +9878,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -10005,19 +10038,19 @@ msgstr "Unable to detach volume %s"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -10125,24 +10158,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Failed to decrypt private key: %s"
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr "Got exception: %s"
@@ -10281,72 +10314,72 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD not found in instance %s"
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "group %s already exists"
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Unable to unplug VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -10355,237 +10388,237 @@ msgstr ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "Starting snapshot for VM %s"
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, fuzzy, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "Registered image %(image_location)s with id %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Size for image %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copying VDI %s to /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Looking up vdi %s for PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s is still available"
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-scanning SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -10594,66 +10627,66 @@ msgstr ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Plugging VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Plugging VBD %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destroying VBD for VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destroying VBD for VDI %s done."
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Running pygrub against %s"
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Found Xen kernel %s"
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "No Xen kernel found.  Booting HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10661,55 +10694,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Writing partition table %s done."
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -10723,199 +10763,209 @@ msgstr "Starting Bridge interface for %s"
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 #, fuzzy
 msgid "Starting instance"
 msgstr "Creating a raw instance"
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 #, fuzzy
 msgid "Starting VM"
 msgstr "Restarting xvp"
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "Finished snapshot and upload for VM %s"
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+#, fuzzy
+msgid "Unable to terminate instance."
+msgstr "Going to start terminating instances"
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 #, fuzzy
 msgid "Destroying VDIs"
 msgstr "Restarting xvp"
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr "kernel/ramdisk files removed"
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 #, fuzzy
 msgid "Destroying VM"
 msgstr "Restarting xvp"
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "setting network host"
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -11044,16 +11094,25 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 msgid "status must be 'in-use'"
 msgstr ""
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr "Going to start terminating instances"
+
diff --git a/nova/locale/en_GB/LC_MESSAGES/nova.po b/nova/locale/en_GB/LC_MESSAGES/nova.po
index d77db9924..8db345a38 100644
--- a/nova/locale/en_GB/LC_MESSAGES/nova.po
+++ b/nova/locale/en_GB/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+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"
@@ -83,7 +83,7 @@ msgstr "Flags path: %s"
 msgid "An unknown exception occurred."
 msgstr "An unknown exception occurred."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -167,8 +167,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr "Keypair data is invalid"
 
@@ -198,7 +198,7 @@ msgstr ""
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Invalid IP protocol %(protocol)s."
@@ -1240,55 +1240,67 @@ msgstr ""
 
 #: nova/exception.py:1157
 #, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "Instance %(instance_id)s is not running."
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1299,7 +1311,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1319,206 +1331,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-#, fuzzy
-msgid "Full set of CONF:"
-msgstr "Full set of FLAGS:"
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, python-format
-msgid "Starting %d workers"
-msgstr ""
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr "Running cmd (SSH): %s"
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr "Result was %s"
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1603,130 +1534,125 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
@@ -1736,69 +1662,74 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, fuzzy, python-format
+msgid "Invalid IP protocol %s."
+msgstr "Invalid IP protocol %(protocol)s."
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
@@ -1807,7 +1738,7 @@ msgstr ""
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
@@ -1817,7 +1748,7 @@ msgid "Detach Volume Failed."
 msgstr ""
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
@@ -1849,138 +1780,138 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance %s: resuming"
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "Invalid cidr %(cidr)s."
@@ -2022,11 +1953,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, fuzzy, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr "Invalid instance type %(instance_type)s."
@@ -2045,19 +1976,19 @@ msgstr ""
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -2069,63 +2000,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:364
+#: nova/api/openstack/common.py:366
 #, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -2179,14 +2110,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
 #: nova/api/openstack/extensions.py:370
 #, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2229,13 +2160,13 @@ msgstr ""
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr ""
 
@@ -2244,20 +2175,20 @@ msgstr ""
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, fuzzy, python-format
 msgid "Calling method %s"
 msgstr "Calling getter %s"
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2270,12 +2201,12 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2283,17 +2214,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2358,211 +2289,211 @@ msgstr ""
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, fuzzy, python-format
 msgid "Flavor '%s' could not be found "
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2570,9 +2501,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
+#: nova/api/openstack/compute/servers.py:1408
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+msgid "Removing options '%s' from query"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2659,7 +2590,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2679,17 +2610,17 @@ msgstr "compute.api::resume %s"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2845,15 +2776,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
@@ -2962,7 +2893,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -2995,29 +2926,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Calling getter %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Calling getter %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3238,33 +3169,33 @@ msgstr ""
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, fuzzy, python-format
 msgid "Instance %s is not attached."
 msgstr "instance %s: snapshotting"
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3283,94 +3214,94 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, fuzzy, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+msgid "Got update for instance: %(instance)s"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/cells/messaging.py:838
+#: nova/cells/messaging.py:862
 #, fuzzy, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+msgid "Got update to delete instance"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3387,7 +3318,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "Instance %(instance_id)s is not running."
@@ -3401,7 +3332,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3428,7 +3359,7 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, fuzzy, python-format
 msgid "Failed to load %s"
 msgstr "Unable to locate volume %s"
@@ -3448,272 +3379,272 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 #, fuzzy
 msgid "network"
 msgstr "instance %s: reset network"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 #, fuzzy
 msgid "instance"
 msgstr "Rebooting instance %s"
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3794,244 +3725,244 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Virtual Interface creation failed"
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4066,728 +3997,733 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "volume %s: creating export"
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Unable to detach volume %s"
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "VBD not found in instance %s"
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: retrieving diagnostics"
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 #, fuzzy
 msgid "Reset network"
 msgstr "instance %s: reset network"
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 #, fuzzy
 msgid "Get console output"
 msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance %s"
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, fuzzy, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, fuzzy, python-format
 msgid "Host %(host)s not found"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Re-exporting %s volumes"
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Re-exporting %s volumes"
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, fuzzy, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr "Invalid instance type %(instance_type)s."
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -4897,7 +4833,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -4908,7 +4844,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -4987,54 +4923,50 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5051,51 +4983,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5180,15 +5112,19 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 msgid "Failed storing info cache"
 msgstr ""
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -5302,103 +5238,103 @@ msgstr ""
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, fuzzy, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr "Pid %d is stale, relaunching dnsmasq"
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Hupping dnsmasq threw %s"
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d is stale, relaunching dnsmasq"
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "killing radvd threw %s"
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d is stale, relaunching radvd"
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "Invalid backend: %s"
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Starting VLAN interface %s"
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Starting Bridge interface for %s"
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5493,38 +5429,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5560,7 +5496,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5643,65 +5579,65 @@ msgstr ""
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5718,27 +5654,27 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5748,17 +5684,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr "Nested return %s"
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5831,11 +5767,92 @@ msgstr ""
 msgid "Running cmd (subprocess): %s"
 msgstr "Running cmd (subprocess): %s"
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr "Result was %s"
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr "Running cmd (SSH): %s"
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+#, fuzzy
+msgid "Full set of CONF:"
+msgstr "Full set of FLAGS:"
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr "DB exception wrapped."
@@ -5974,58 +5991,63 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 #, fuzzy
 msgid "An unknown RPC related exception occurred."
 msgstr "An unknown exception occurred."
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr "Invalid reuse of an RPC connection."
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -6344,7 +6366,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6353,36 +6375,48 @@ msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, fuzzy, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr "Instance %(instance_id)s is not running."
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:357
+#: nova/scheduler/filter_scheduler.py:361
 #, python-format
-msgid "Choosing host %(chosen_host)s"
+msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6577,46 +6611,46 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 msgid "memcached_servers not defined"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6669,58 +6703,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr ""
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 msgid "fake vswitch not found"
 msgstr ""
@@ -6754,17 +6772,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6773,7 +6791,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
@@ -6790,16 +6808,16 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 msgid "spawn error"
 msgstr ""
 
@@ -6895,6 +6913,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -6919,11 +6953,10 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -7048,19 +7081,19 @@ msgstr ""
 "Stdout: %(stdout)r\n"
 "Stderr: %(stderr)r"
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7228,15 +7261,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7294,97 +7327,97 @@ msgstr ""
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7720,7 +7753,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7735,24 +7768,24 @@ msgstr "Get console output for instance %s"
 msgid "Host IP address is: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8076,12 +8109,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8247,7 +8280,7 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8315,203 +8348,203 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr "Connection to melange failed"
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: created successfully"
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "User does not have admin privileges"
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8519,73 +8552,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Unable to detach volume %s"
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8593,50 +8626,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8646,67 +8679,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8739,153 +8772,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, fuzzy, python-format
 msgid "Writing stored info to %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -8998,87 +9031,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9151,35 +9184,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, fuzzy, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr "Running cmd (subprocess): %s"
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 #, fuzzy
 msgid "File transfer from PowerVM manager failed"
 msgstr "Connection to melange failed"
@@ -9272,74 +9305,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, fuzzy, python-format
 msgid "LPAR instance '%s' not found"
 msgstr "instance %s: suspending"
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, fuzzy, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, fuzzy, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr "Rebooting instance %s"
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, fuzzy, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr "Virtual Interface creation failed"
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, fuzzy, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr "Rebooting instance %s"
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, python-format
 msgid "Instance '%s' failed to boot"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, fuzzy, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr "instance %s: snapshotting"
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, python-format
 msgid "Shutting down the instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9797,7 +9830,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -9957,19 +9990,19 @@ msgstr "Unable to detach volume %s"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -10073,24 +10106,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -10229,72 +10262,72 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD not found in instance %s"
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Unable to unplug VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -10303,236 +10336,236 @@ msgstr ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, fuzzy, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Size for image %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copying VDI %s to /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Looking up vdi %s for PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s is still available"
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-scanning SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -10541,66 +10574,66 @@ msgstr ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Plugging VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Plugging VBD %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destroying VBD for VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destroying VBD for VDI %s done."
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Running pygrub against %s"
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Found Xen kernel %s"
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "No Xen kernel found.  Booting HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10608,55 +10641,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Writing partition table %s done."
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -10670,194 +10710,204 @@ msgstr "Starting Bridge interface for %s"
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 #, fuzzy
 msgid "Starting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+#, fuzzy
+msgid "Unable to terminate instance."
+msgstr "Rebooting instance %s"
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -10986,16 +11036,25 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 msgid "status must be 'in-use'"
 msgstr ""
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr "Instance %(instance_id)s is not running."
+
diff --git a/nova/locale/en_US/LC_MESSAGES/nova.po b/nova/locale/en_US/LC_MESSAGES/nova.po
index 3bdeafc46..e744d7b12 100644
--- a/nova/locale/en_US/LC_MESSAGES/nova.po
+++ b/nova/locale/en_US/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+0000\n"
 "PO-Revision-Date: 2013-01-21 18:28+0000\n"
 "Last-Translator: Jeremy Stanley <fungi@yuggoth.org>\n"
 "Language-Team: en_US <LL@li.org>\n"
@@ -85,7 +85,7 @@ msgstr "Flags path: %s"
 msgid "An unknown exception occurred."
 msgstr "An unknown exception occurred."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr "Exception in string format operation"
 
@@ -170,8 +170,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr "Keypair data is invalid"
 
@@ -201,7 +201,7 @@ msgstr "Invalid metadata size"
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Invalid IP protocol %(protocol)s."
@@ -1284,57 +1284,71 @@ msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "Keypair %(name)s not found for user %(user_id)s"
 
 #: nova/exception.py:1157
+#, fuzzy, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+"unexpected task state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+
+#: nova/exception.py:1162
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "The CA file for %(project)s could not be found"
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "The CRL file for %(project)s could not be found"
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "set_admin_password is not implemented by this driver."
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "Instance %(instance_id)s is not in rescue mode"
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "Instance %(instance_id)s is not in rescue mode"
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1345,7 +1359,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr "Notifying Schedulers of capabilities ..."
 
@@ -1366,208 +1380,127 @@ msgstr "JSON file representing policy"
 msgid "Rule checked when requested rule is not found"
 msgstr "Rule checked when requested rule is not found"
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr "Created reservations %(reservations)s"
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr "Failed to commit reservations %(reservations)s"
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, fuzzy, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr "Created reservations %(reservations)s"
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr "Failed to roll back reservations %(reservations)s"
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, fuzzy, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr "Failed to roll back reservations %(reservations)s"
 
-#: nova/service.py:197
-#, fuzzy
-msgid "Full set of CONF:"
-msgstr "Full set of FLAGS:"
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr "%(flag)s : FLAG SET "
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr "Caught %s, exiting"
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr "Parent process has died unexpectedly, exiting"
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr "Forking too fast, sleeping"
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr "Unhandled exception"
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr "Started child %d"
-
-#: nova/service.py:334
-#, python-format
-msgid "Starting %d workers"
-msgstr "Starting %d workers"
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr "Child %(pid)d killed by signal %(sig)d"
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr "Child %(pid)d exited with status %(code)d"
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr "pid %d not in child list"
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr "Caught %s, stopping children"
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr "Waiting on %d children to exit"
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, fuzzy, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr "Starting %(topic)s node (version %(vcs_string)s)"
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr "Creating Consumer connection for Service %s"
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "Service killed that has no database entry"
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr "serve() can only be called once"
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, fuzzy, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr "Running cmd (SSH): %s"
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr "Environment not supported over SSH"
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr "process_input not supported over SSH"
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr "Result was %s"
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, fuzzy, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr "Unknown base file: %s"
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Expected object of type: %s"
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Invalid server_string: %s"
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc: '%(name)s' took %(total_time).2f secs"
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr "Reloading cached file %s"
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "Could not remove tmpdir: %s"
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, fuzzy, python-format
 msgid "%s is not a string or unicode"
 msgstr "Server name is not a string or unicode"
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, fuzzy, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr "Server name must be less than 256 characters."
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1652,7 +1585,7 @@ msgstr "FaultWrapper: %s"
 msgid "Too many failed authentications."
 msgstr "Too many failed authentications."
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
@@ -1661,124 +1594,119 @@ msgstr ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr "Signature not provided"
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr "Access key not provided"
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr "Failure communicating with keystone"
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "Live Migration failure: %(e)s"
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "Too many failed authentications."
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr "action: %s"
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\tval: %(value)s"
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "Unauthorized request for controller=%(controller)s and action=%(action)s"
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "InstanceNotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "VolumeNotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr "SnapshotNotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "NotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr "EC2APIError raised: %s"
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr "KeyPairExists raised: %s"
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, fuzzy, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr "InvalidRequest raised: %s"
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr "InvalidParameterValue raised: %s"
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr "InvalidPortRange raised: %s"
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr "NotAuthorized raised: %s"
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr "InvalidRequest raised: %s"
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr "QuotaError raised: %s"
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr "Invalid id: bogus (expecting \"i-...\"): %s"
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Unexpected error raised: %s"
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr "Environment: %s"
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "An unknown error has occurred. Please try your request again."
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "Unsupported API request: controller = %(controller)s, action = %(action)s"
@@ -1788,69 +1716,74 @@ msgstr "Unsupported API request: controller = %(controller)s, action = %(action)
 msgid "Create snapshot of volume %s"
 msgstr "Create snapshot of volume %s"
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "Could not find key pair(s): %s"
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr "Create key pair %s"
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr "Quota exceeded, too many key pairs."
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr "Import key %s"
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Delete key pair %s"
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr "Not enough parameters, need group_name or group_id"
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "%s Not enough parameters to build a valid rule"
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, fuzzy, python-format
+msgid "Invalid IP protocol %s."
+msgstr "Invalid IP protocol %(protocol)s."
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr "No rule for the specified parameters."
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr "%s - This rule already exists in group"
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "Create volume from snapshot %s"
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Create volume of %s GB"
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr "Delete Failed"
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
@@ -1859,7 +1792,7 @@ msgstr "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgid "Attach Failed."
 msgstr "Attach Failed."
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Detach volume %s"
@@ -1869,7 +1802,7 @@ msgid "Detach Volume Failed."
 msgstr "Detach Volume Failed."
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "attribute not supported: %s"
@@ -1901,100 +1834,100 @@ msgstr "Unable to release IP Address."
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Unable to associate IP Address, no fixed_ips."
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr "multiple fixed_ips exist, using the first: %s"
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr "Floating ip is already associated."
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr "l3driver call to add floating ip failed."
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 msgid "Error, unable to associate floating ip."
 msgstr "Error, unable to associate floating ip."
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Disassociate address %s"
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr "Floating ip is not associated."
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr "Cannot disassociate auto assigned floating ip"
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr "Image must be available"
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr "Going to start terminating instances"
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reboot instance %r"
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr "Going to stop instances"
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr "Going to start instances"
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr "De-registering image %s"
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr "imageLocation is required"
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Registered image %(image_location)s with id %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr "user or group not specified"
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr "only group \"all\" is supported"
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr "operation_type must be add or remove"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Updating image %s publicity"
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr "Not allowed to modify attributes for image %s"
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
@@ -2003,40 +1936,40 @@ msgstr ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "Couldn't stop instance with in %d sec"
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr "image of %(instance)s at %(now)s"
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 #, fuzzy
 msgid "Expecting a list of resources"
 msgstr "Getting list of instances"
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance not present"
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 #, fuzzy
 msgid "Expecting a list of tagSets"
 msgstr "Getting list of instances"
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 msgid "Invalid CIDR"
 msgstr "Invalid CIDR"
 
@@ -2077,12 +2010,12 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 #, fuzzy
 msgid "Invalid proxy request signature."
 msgstr "Invalid request: %s"
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, fuzzy, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr "Failed to get metadata for ip: %s"
@@ -2101,12 +2034,12 @@ msgstr "%(url)s returned with HTTP %(status)d"
 msgid "Must specify an ExtensionManager class"
 msgstr "Must specify an ExtensionManager class"
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr "Extended resource: %s"
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
@@ -2115,7 +2048,7 @@ msgstr ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr "Extension %(ext_name)s extending resource: %(collection)s"
@@ -2129,63 +2062,63 @@ msgstr ""
 "status is UNKNOWN from vm_state=%(vm_state)s task_state=%(task_state)s. "
 "Bad upgrade or db corrupted?"
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr "limit param must be an integer"
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr "limit param must be positive"
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr "offset param must be an integer"
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr "offset param must be positive"
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr "marker [%s] not found"
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr "href %s does not contain version"
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr "Image metadata limit exceeded"
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr "Image metadata key cannot be blank"
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr "Image metadata key too long"
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr "Invalid image metadata"
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 
-#: nova/api/openstack/common.py:364
-#, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+#: nova/api/openstack/common.py:366
+#, fuzzy, python-format
+msgid "Instance is in an invalid state for '%s'"
 msgstr "Instance is in an invalid state for '%(action)s'"
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr "Rejecting snapshot request, snapshots currently disabled"
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr "Instance snapshots are not permitted at this time."
 
@@ -2239,14 +2172,14 @@ msgstr "Calling extension factory %s"
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "Failed to load extension %(ext_factory)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "Failed to load extension %(classpath)s: %(exc)s"
 
 #: nova/api/openstack/extensions.py:370
-#, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+#, fuzzy, python-format
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr "Failed to load extension %(ext_name)s: %(exc)s"
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2289,13 +2222,13 @@ msgstr "Empty body provided in request"
 msgid "There is no such action: %s"
 msgstr "There is no such action: %s"
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr "Malformed request body"
 
@@ -2304,20 +2237,20 @@ msgstr "Malformed request body"
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, fuzzy, python-format
 msgid "Calling method %s"
 msgstr "Calling setter %s"
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr "Unsupported Content-Type"
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr "Malformed request url"
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2330,12 +2263,12 @@ msgstr "element is not a child"
 msgid "root element selecting a list"
 msgstr "root element selecting a list"
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr "subclasses must implement construct()!"
 
@@ -2343,17 +2276,17 @@ msgstr "subclasses must implement construct()!"
 msgid "Initializing extension manager."
 msgstr "Initializing extension manager."
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr "Invalid is_public filter [%s]"
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr "Invalid minRam filter [%s]"
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr "Invalid minDisk filter [%s]"
@@ -2420,213 +2353,213 @@ msgstr "Server does not exist"
 msgid "Metadata item was not found"
 msgstr "Metadata item was not found"
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr "Invalid changes-since value"
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 msgid "Only administrators may list deleted instances"
 msgstr "Only administrators may list deleted instances"
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, fuzzy, python-format
 msgid "Flavor '%s' could not be found "
 msgstr "Host '%s' could not be found."
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr "Instance could not be found"
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr "Bad personality format: missing %s"
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr "Bad personality format"
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr "Personality content for %s cannot be decoded"
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr "Unknown argment : port"
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr "Bad port format: port uuid is not in proper format (%s)"
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr "Bad networks format: network uuid is not in proper format (%s)"
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr "Invalid fixed IP address (%s)"
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr "Duplicate networks (%s) are not allowed"
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr "Bad network format: missing %s"
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr "Bad networks format"
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr "Userdata content cannot be decoded"
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr "accessIPv4 is not proper IPv4 format"
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr "accessIPv6 is not proper IPv6 format"
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr "Server name is not defined"
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr "Invalid flavorRef provided."
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr "min_count must be an integer value"
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr "min_count must be > 0"
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr "max_count must be an integer value"
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr "max_count must be > 0"
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr "min_count must be <= max_count"
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr "Can not find requested image"
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr "Invalid key_name provided."
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 msgid "HostId cannot be updated."
 msgstr "HostId cannot be updated."
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "HostId cannot be updated."
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr "Instance has not been resized."
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "Instance %(instance_id)s could not be found."
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr "Argument 'type' for reboot is not HARD or SOFT"
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr "Missing argument 'type' for reboot"
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr "Unable to locate requested flavor."
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr "Resize requires a flavor change."
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr "Missing imageRef attribute"
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr "Invalid imageRef provided."
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr "Missing flavorRef attribute"
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr "No adminPass was specified"
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr "Invalid adminPass"
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Failed to soft reboot instance."
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr "Unable to parse metadata key/value pairs."
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "Resize request has invalid 'flavorRef' attribute."
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "Resize requests require 'flavorRef' attribute."
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr "Invalid request body"
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr "Could not parse imageRef from request."
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr "Cannot find image for rebuild"
 
@@ -2634,9 +2567,9 @@ msgstr "Cannot find image for rebuild"
 msgid "createImage entity requires name attribute"
 msgstr "createImage entity requires name attribute"
 
-#: nova/api/openstack/compute/servers.py:1409
-#, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+#: nova/api/openstack/compute/servers.py:1408
+#, fuzzy, python-format
+msgid "Removing options '%s' from query"
 msgstr "Removing options '%(unk_opt_str)s' from query"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2724,7 +2657,7 @@ msgstr "host and block_migration must be specified."
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, fuzzy, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr "Live migration of instance %(id)s to host %(host)s failed"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2743,18 +2676,18 @@ msgid "Compute.api::resetState %s"
 msgstr "Compute.api::resetState %s"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
-#, python-format
-msgid "Cannot show aggregate: %(id)s"
+#, fuzzy, python-format
+msgid "Cannot show aggregate: %s"
 msgstr "Cannot show aggregate: %(id)s"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
-#, python-format
-msgid "Cannot update aggregate: %(id)s"
+#, fuzzy, python-format
+msgid "Cannot update aggregate: %s"
 msgstr "Cannot update aggregate: %(id)s"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
-#, python-format
-msgid "Cannot delete aggregate: %(id)s"
+#, fuzzy, python-format
+msgid "Cannot delete aggregate: %s"
 msgstr "Cannot delete aggregate: %(id)s"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2917,16 +2850,16 @@ msgstr "Network does not have %s action"
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr "%s must be either 'MANUAL' or 'AUTO'."
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 #, fuzzy
 msgid "host and onSharedStorage must be specified."
 msgstr "host and block_migration must be specified."
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, fuzzy, python-format
 msgid "Error in evacuate, %s"
 msgstr "Error in migrate %s"
@@ -3036,7 +2969,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "Floating ip %(address)s is not associated."
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3070,32 +3003,32 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr "Putting host %(host)s in maintenance mode %(mode)s."
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 #, fuzzy
 msgid "Virt driver does not implement host maintenance mode."
 msgstr "Virt driver does not implement uptime function."
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Calling setter %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Updating host stats"
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 #, fuzzy
 msgid "Virt driver does not implement host disabled status."
 msgstr "Virt driver does not implement uptime function."
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 #, fuzzy
 msgid "Virt driver does not implement host power management."
 msgstr "Virt driver does not implement uptime function."
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr "Describe-resource is admin only functionality"
 
@@ -3323,33 +3256,33 @@ msgstr "vol=%s"
 msgid "Delete volume with id: %s"
 msgstr "Delete volume with id: %s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, python-format
 msgid "Instance %s is not attached."
 msgstr "Instance %s is not attached."
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, fuzzy, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr "Bad port format: port uuid is not in proper format (%s)"
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr "Delete snapshot with id: %s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr "Create snapshot from volume %s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, fuzzy, python-format
 msgid "Invalid value '%s' for force."
 msgstr "Invalid value '%s' for force. "
@@ -3368,94 +3301,94 @@ msgstr "Release address %s"
 msgid "Instance has had its instance_type removed from the DB"
 msgstr "Instance has had its instance_type removed from the DB"
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, fuzzy, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr "Error processing message.  Skipping it."
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "no method for message: %s"
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, fuzzy, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr "Failed to load extension %(ext_factory)s: %(exc)s"
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "no method for message: %s"
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, fuzzy, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr "Sending message(s) to: %s"
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, fuzzy, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr "Casted '%(method)s' to compute '%(host)s'"
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, fuzzy, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
-msgstr "Migration not found for instance %(instance_id)s with status %(status)s."
+msgid "Got update for instance: %(instance)s"
+msgstr "Starting migration network for instance %(instance_uuid)s"
 
-#: nova/cells/messaging.py:838
+#: nova/cells/messaging.py:862
 #, fuzzy, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+msgid "Got update to delete instance"
 msgstr "Starting migration network for instance %(instance_uuid)s"
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3472,7 +3405,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "Destroying VDIs for Instance %(instance_uuid)s"
@@ -3486,7 +3419,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3512,7 +3445,7 @@ msgstr "Netmask to push into openvpn config"
 msgid "Launching VPN for %s"
 msgstr "Launching VPN for %s"
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, fuzzy, python-format
 msgid "Failed to load %s"
 msgstr "Failed to create VM %s"
@@ -3532,282 +3465,282 @@ msgstr "element is not a child"
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 #, fuzzy
 msgid "leasing ip"
 msgstr "Creating vifs"
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 #, fuzzy
 msgid "releasing ip"
 msgstr "Creating vifs"
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 #, fuzzy
 msgid "Reserved"
 msgstr "received %s"
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "DB error: %s"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 #, fuzzy
 msgid "network"
 msgstr "Reset network"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 #, fuzzy
 msgid "IP address"
 msgstr "start address"
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 #, fuzzy
 msgid "No fixed IP found."
 msgstr "Zero fixed ips could be found."
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, fuzzy, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr "No fixed ips associated to instance"
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "Floating ip %(address)s already exists."
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr "id"
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr "IPv4"
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr "IPv6"
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "start address"
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr "DNS1"
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr "DNS2"
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr "VlanID"
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr "project"
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr "uuid"
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 #, fuzzy
 msgid "No networks found"
 msgstr "Network not found"
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "%(req)s is required to create a network."
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 #, fuzzy
 msgid "instance"
 msgstr "stop instance"
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "Service %(service_id)s could not be found."
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "Service %(service_id)s could not be found."
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "Unexpected error: %s"
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 #, fuzzy
 msgid "PROJECT"
 msgstr "project"
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3891,16 +3824,16 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 msgid "Cannot run any more instances of this type."
 msgstr "Cannot run any more instances of this type."
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "Can only run %s more instances of this type."
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
@@ -3909,7 +3842,7 @@ msgstr ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
@@ -3918,93 +3851,93 @@ msgstr ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr "Metadata property key blank"
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr "Metadata property key greater than 255 characters"
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr "Metadata property value greater than 255 characters"
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Unable to attach boot volume to instance %s"
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Going to run %s instances..."
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "Instance type %(instance_type_id)s could not be found."
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, fuzzy, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr "host for instance is down, deleting from database"
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 msgid "Going to try to soft delete instance"
 msgstr "Going to try to soft delete instance"
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 msgid "Going to try to terminate instance"
 msgstr "Going to try to terminate instance"
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 msgid "Going to try to stop instance"
 msgstr "Going to try to stop instance"
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 msgid "Going to try to start instance"
 msgstr "Going to try to start instance"
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr "Searching by: %s"
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, python-format
 msgid "snapshot for %s"
 msgstr "snapshot for %s"
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id is None. Assuming migration."
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4013,62 +3946,62 @@ msgstr ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, fuzzy, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr "Locking"
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr "Unlocking"
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr "Volume must be attached in order to detach."
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Going to try to live migrate instance to %s"
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr "Keypair name contains unsafe characters"
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr "Keypair name must be between 1 and 255 characters long"
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr "Security group %s is not a string or unicode"
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Security group %s cannot be empty."
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -4077,67 +4010,67 @@ msgstr ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr "Security group %s should not be greater than 255 characters."
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr "Quota exceeded, too many security groups."
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group %s"
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Security group %s already exists"
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Unable to destroy vbd %s"
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 msgid "Security group is still in use"
 msgstr "Security group is still in use"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr "Failed to update usages deallocating security group"
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group %s"
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Rule (%s) not found"
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr "Quota exceeded, too many security group rules."
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorize security group ingress %s"
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr "Security group id should be integer"
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr "Aborting claim: %s"
@@ -4174,220 +4107,220 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, fuzzy, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr "Total VCPUs: %(total_vcpus)d, used: %(used_vcpus)d"
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, fuzzy, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr "Disk limit not specified, defaulting to unlimited"
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, fuzzy, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr "Disk limit: %(disk_gb_limit)d GB, free: %(free_disk_gb)d GB"
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, fuzzy, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 "Unable to claim resources.  Free CPU %(free_vcpus)d < requested CPU "
 "%(vcpus)d"
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr "names can only contain [a-zA-Z0-9_.- ]"
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, fuzzy, python-format
-msgid "'%s' argument must be a positive integer"
-msgstr "create arguments must be positive integers"
+msgid "'%s' argument must be greater than 0"
+msgstr "Volume size '%s' must be an integer and greater than 0"
 
-#: nova/compute/flavors.py:113
+#: nova/compute/flavors.py:108
+#, fuzzy, python-format
+msgid "'%s' argument must be greater than or equal to 0"
+msgstr "Volume size '%s' must be an integer and greater than 0"
+
+#: nova/compute/flavors.py:117
 #, fuzzy
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr "create arguments must be positive integers"
 
-#: nova/compute/flavors.py:121
-#, fuzzy, python-format
-msgid "'%s' argument must be greater than 0"
-msgstr "Volume size '%s' must be an integer and greater than 0"
-
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr "DB error: %s"
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr "Instance type %s not found for deletion"
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr "Possibly task preempted."
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr "Instance has been destroyed from under us while trying to set it to ERROR"
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Failed to terminate instance"
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr "Current state is %(drv_state)s, state in DB is %(db_state)s."
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr "Rebooting instance after nova-compute restart."
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr "Hypervisor driver does not support resume guests"
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Failed to suspend instance"
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Hypervisor driver does not support firewall rules"
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Unexpected status code"
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr "Checking state"
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "Setting up bdm %s"
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, fuzzy, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr "Memory limit not specified, defaulting to unlimited"
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Failed to dealloc network for deleted instance"
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "Instance failed to spawn"
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "DB error: %s"
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr "Error trying to reschedule"
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr "Retry info not present, will not reschedule"
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr "No request spec, will not reschedule"
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, fuzzy, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr "Re-scheduling instance: attempt %d"
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr "Instance build timed out. Set to error state."
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
@@ -4396,7 +4329,7 @@ msgstr ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
@@ -4405,99 +4338,99 @@ msgstr ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr "Starting instance..."
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr "Instance failed network setup"
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "Instance network_info: |%s|"
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr "Instance failed block device setup"
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr "Instance failed to spawn"
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr "Deallocating network for instance"
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s instance"
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Failed to dealloc network for deleted instance"
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Ignoring DiskNotFound: %s"
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "Ignoring VolumeNotFound: %s"
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr "terminating bdm %s"
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr "Ignoring volume cleanup failure due to %s"
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s. Setting instance vm_state to ERROR"
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 msgid "Rebuilding instance"
 msgstr "Rebuilding instance"
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, fuzzy, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr "%(path)s is not on shared storage: %(reason)s"
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Attach boot from volume failed: %s"
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 msgid "Rebooting instance"
 msgstr "Rebooting instance"
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -4506,21 +4439,21 @@ msgstr ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "Cannot reboot instance: %(exc)s"
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: rebooted"
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 msgid "instance snapshotting"
 msgstr "instance snapshotting"
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -4529,45 +4462,45 @@ msgstr ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "Found %(num_images)d images (rotation: %(rotation)d)"
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "Rotating out %d backups"
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr "Deleting image %s"
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "Failed to set admin password. Instance %s is not running"
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr "Root password set"
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 #, fuzzy
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr "set_admin_password is not implemented by this driver."
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr "set_admin_password failed: %s"
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr "error setting admin password"
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
@@ -4576,111 +4509,111 @@ msgstr ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr "injecting file to %(path)s"
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr "Rescuing"
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Error trying to reschedule"
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "DB error: %s"
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 msgid "Unrescuing"
 msgstr "Unrescuing"
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr "Changing instance metadata according to %(diff)r"
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instance has no volume."
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr "destination same as source!"
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr "Migrating"
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr "Pausing"
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr "Unpausing"
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 msgid "Retrieving diagnostics"
 msgstr "Retrieving diagnostics"
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr "Resuming"
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 msgid "Reset network"
 msgstr "Reset network"
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 msgid "Inject network info"
 msgstr "Inject network info"
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "network_info to inject: |%s|"
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 msgid "Get console output"
 msgstr "Get console output"
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 msgid "Getting vnc console"
 msgstr "Getting vnc console"
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Getting vnc console"
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr "Booting with volume %(volume_id)s at %(mountpoint)s"
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr "Attaching volume %(volume_id)s to %(mountpoint)s"
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
@@ -4689,59 +4622,59 @@ msgstr ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr "Detach volume %(volume_id)s from mountpoint %(mp)s"
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance"
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Faild to detach volume %(volume_id)s from %(mp)s"
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, fuzzy, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr "allocate_for_instance() for %s"
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, fuzzy, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr "Port %(port_id)s is still in use."
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, fuzzy, python-format
 msgid "Host %(host)s not found"
 msgstr "Host %(host)s could not be found."
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr "Pre live migration failed at  %(dest)s"
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr "_post_live_migration() is started.."
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr "Migrating instance to %(dest)s finished successfully."
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -4749,20 +4682,20 @@ msgstr ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr "Post operation of migration started"
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Failed to get info for disk %s"
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr "Updated the info_cache for instance"
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -4771,12 +4704,12 @@ msgstr ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr "Setting migration %(migration_id)s to error: %(reason)s"
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
@@ -4785,26 +4718,26 @@ msgstr ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "Instance %(instance_uuid)s not found"
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr "In ERROR state"
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, fuzzy, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr "Error auto-confirming resize: %(e)s. Will retry later."
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
@@ -4813,25 +4746,25 @@ msgstr ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr "Failed to generate usage audit for instance on host %s"
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr "Updating bandwidth usage cache"
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Updating bandwidth usage cache"
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr "Updating host status"
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -4840,11 +4773,11 @@ msgstr ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr "During sync_power_state the instance has a pending task. Skip."
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
@@ -4853,57 +4786,57 @@ msgstr ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr "Instance shutdown by itself. Calling the stop API."
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr "error during stop() in sync_power_state."
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr "Instance is paused or suspended unexpectedly. Calling the stop API."
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 #, fuzzy
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr "Instance is paused or suspended unexpectedly. Calling the stop API."
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr "Instance is not stopped. Calling the stop API."
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 msgid "Instance is not (soft-)deleted."
 msgstr "Instance is not (soft-)deleted."
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 #, fuzzy
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, skipping..."
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr "Reclaiming deleted instance"
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Loading compute driver '%s'"
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr "No service record for host %s"
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
@@ -4912,7 +4845,7 @@ msgstr ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
@@ -4921,11 +4854,16 @@ msgstr ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, fuzzy, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 
+#: nova/compute/manager.py:4129
+#, fuzzy, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr "Setting instance to %(state)s state."
+
 #: nova/compute/resource_tracker.py:92
 #, fuzzy
 msgid ""
@@ -5045,7 +4983,7 @@ msgstr "Unable to find host for Instance %s"
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr "Using %(prefix)s instead of %(req_prefix)s"
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5056,7 +4994,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 #, fuzzy
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr "block_device_mapping %s"
@@ -5137,56 +5075,52 @@ msgstr "Checking Token: %(token)s, %(token_valid)s)"
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 #, fuzzy
 msgid "Failed to notify cells of instance update"
 msgstr "Failed to reboot instance"
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 #, fuzzy
 msgid "Failed to notify cells of instance fault"
 msgstr "Failed to reboot instance"
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "Unrecognized read_deleted value '%s'"
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr "Change will make usage less than 0 for the following resources: %(unders)s"
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5203,51 +5137,51 @@ msgstr "version should be an integer"
 msgid "Upgrade DB using Essex release first."
 msgstr "Upgrade DB using Essex release first."
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5335,16 +5269,20 @@ msgstr "Bad prefix for to_global_ipv6: %s"
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr "Bad project_id for to_global_ipv6: %s"
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr "instance is a required argument to use @refresh_cache"
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 #, fuzzy
 msgid "Failed storing info cache"
 msgstr "Failed to terminate instance"
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr "re-assign floating IP %(address)s from instance %(instance_id)s"
@@ -5466,17 +5404,17 @@ msgstr "This driver only supports type 'a' entries."
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr "Attempted to remove chain %s which does not exist"
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr "Unknown chain: %r"
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
@@ -5485,86 +5423,86 @@ msgstr ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr "IPTablesManager.apply completed with success"
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr "arping error for ip %s"
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr "Pid %d is stale, skip killing dnsmasq"
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Hupping dnsmasq threw %s"
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d is stale, relaunching dnsmasq"
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "killing radvd threw %s"
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d is stale, relaunching radvd"
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "Invalid mode: '%s'"
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Starting VLAN interface %s"
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Starting bridge %s "
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr "Failed to add interface: %s"
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, python-format
 msgid "Starting bridge %s "
 msgstr "Starting bridge %s "
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, python-format
 msgid "Done starting bridge %s"
 msgstr "Done starting bridge %s"
@@ -5665,16 +5603,16 @@ msgstr ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr "cidr already in use"
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
@@ -5683,16 +5621,16 @@ msgstr ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr "Network already exists!"
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "Network must be disassociated from project %s before delete"
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
@@ -5700,7 +5638,7 @@ msgstr ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, fuzzy, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5738,7 +5676,7 @@ msgstr "_delete: %s"
 msgid "Cannot delete domain |%s|"
 msgstr "Cannot delete aggregate: %(id)s"
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr "v4 subnets are required for legacy nw_info"
 
@@ -5821,68 +5759,68 @@ msgstr "Multiple floating IP pools matches found for name '%s'"
 msgid "Quantum Error creating security group %s"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Caught error: %s"
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Security group id should be integer"
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Caught error: %s"
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Security group with rule %(rule_id)s not found."
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, fuzzy, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr "Security group %(security_group_id)s not found for project %(project_id)s."
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5901,27 +5839,27 @@ msgstr "This rule already exists in group %s"
 msgid "Original exception being dropped: %s"
 msgstr "foreign key could not be dropped"
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr "Could not release the acquired lock `%s`"
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, 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\"..."
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, 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\"..."
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, fuzzy, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
@@ -5931,17 +5869,17 @@ msgstr "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgid "Deprecated: %s"
 msgstr "Deprecated Config: %s"
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, fuzzy, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr "Error reading image info file %(filename)s: %(error)s"
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr "syslog facility must be one of: %s"
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, fuzzy, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr "Fatal call to deprecated config %(msg)s"
@@ -6016,11 +5954,92 @@ msgstr "Got unknown keyword args to utils.execute: %r"
 msgid "Running cmd (subprocess): %s"
 msgstr "Running cmd (subprocess): %s"
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr "Result was %s"
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r failed. Retrying."
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr "Running cmd (SSH): %s"
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr "Environment not supported over SSH"
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr "process_input not supported over SSH"
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+#, fuzzy
+msgid "Full set of CONF:"
+msgstr "Full set of FLAGS:"
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr "Caught %s, exiting"
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr "Parent process has died unexpectedly, exiting"
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr "Forking too fast, sleeping"
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr "Unhandled exception"
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr "Started child %d"
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr "Starting %d workers"
+
+#: nova/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"
+
+#: nova/openstack/common/service.py:262
+#, fuzzy, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr "Child %(pid)d exited with status %(code)d"
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr "pid %d not in child list"
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr "Caught %s, stopping children"
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr "Waiting on %d children to exit"
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr "DB exception wrapped."
@@ -6162,11 +6181,11 @@ msgstr "Making asynchronous fanout cast..."
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr "Sending %(event_type)s on %(topic)s"
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr "An unknown RPC related exception occurred."
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
@@ -6175,47 +6194,52 @@ msgstr ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 #, fuzzy
 msgid "<unknown>"
 msgstr "Unknown"
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr "Invalid reuse of an RPC connection."
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr "Specified RPC version, %(version)s, not supported by this endpoint."
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, fuzzy, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr "Specified RPC version, %(version)s, not supported by this endpoint."
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, fuzzy, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr "Failed to remove %(base_file)s, error was %(error)s"
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Returning exception %s to caller"
@@ -6537,7 +6561,7 @@ msgstr "Driver must implement schedule_run_instance"
 msgid "Driver must implement select_hosts"
 msgstr "Driver must implement schedule_run_instance"
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6547,20 +6571,32 @@ msgstr ""
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 
 #: nova/scheduler/filter_scheduler.py:73
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+#, fuzzy, python-format
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr "Attempting to build %(num_instances)d instance(s)"
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, fuzzy, python-format
+msgid "Request Spec: %s"
+msgstr "Request: %s"
+
+#: nova/scheduler/filter_scheduler.py:97
+#, fuzzy, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr "Destroying VDIs for Instance %(instance_uuid)s"
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr "Invalid value for 'scheduler_max_attempts', must be >= 1"
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
@@ -6569,17 +6605,17 @@ msgstr ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "Filtered %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:357
-#, python-format
-msgid "Choosing host %(chosen_host)s"
-msgstr ""
+#: nova/scheduler/filter_scheduler.py:361
+#, fuzzy, python-format
+msgid "Weighed %(hosts)s"
+msgstr "Filtered %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6790,47 +6826,47 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr "Recovered model server connection!"
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr "model server went away"
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 #, fuzzy
 msgid "memcached_servers not defined"
 msgstr "Server name is not defined"
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6883,58 +6919,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr "Attempted to instantiate singleton"
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr "Faking execution of cmd (subprocess): %s"
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr "Faked command matched %s"
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr "Faked command raised an exception %s"
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr "status must be available"
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr "already attached"
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr "already detached"
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr "Please extend mock libvirt module to support flags"
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr "Expected a list for 'auth' parameter"
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr "Expected a function in 'auth[0]' parameter"
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr "Expected a function in 'auth[1]' parameter"
-
 #: nova/tests/test_hypervapi.py:433
 #, fuzzy
 msgid "fake vswitch not found"
@@ -6971,7 +6991,7 @@ msgstr "200 No Roles"
 msgid "unexpected role header"
 msgstr "unexpected role header"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
@@ -6979,11 +6999,11 @@ msgstr ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 
@@ -6992,7 +7012,7 @@ msgstr "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr "Running instances: %s"
@@ -7009,16 +7029,16 @@ msgstr "After terminating instances: %s"
 msgid "Internal error"
 msgstr "Internal error"
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "After force-killing instances: %s"
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 #, fuzzy
 msgid "spawn error"
 msgstr "unknown guestmount error"
@@ -7121,6 +7141,22 @@ msgstr "Unexpected status code"
 msgid "Decoding JSON: %s"
 msgstr "Decoding JSON: %s"
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr "Please extend mock libvirt module to support flags"
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr "Expected a list for 'auth' parameter"
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr "Expected a function in 'auth[0]' parameter"
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr "Expected a function in 'auth[1]' parameter"
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -7145,11 +7181,11 @@ msgid "Loading compute driver '%s'"
 msgstr "Loading compute driver '%s'"
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+#, fuzzy
+msgid "Unable to load the virtualization driver"
 msgstr "Unable to load the virtualization driver: %s"
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -7275,19 +7311,19 @@ msgstr ""
 " stdout: %(out)s\n"
 " stderr: %(err)s"
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7458,15 +7494,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7525,41 +7561,41 @@ msgstr "partition %s not found"
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr "image already mounted"
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, fuzzy, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
@@ -7568,56 +7604,56 @@ msgstr ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, fuzzy, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr "Failed to unmount container filesystem: %s"
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, fuzzy, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr "Failed to unmount container filesystem: %s"
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, fuzzy, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr "Not implemented on Windows"
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr "User %(username)s not found in password file."
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr "User %(username)s not found in shadow file."
@@ -7956,7 +7992,7 @@ msgstr "Windows version: %s "
 msgid "get_available_resource called"
 msgstr "get_available_resource called"
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr "Updating host stats"
@@ -7971,24 +8007,24 @@ msgstr "get_console_output called"
 msgid "Host IP address is: %s"
 msgstr "Release address %s"
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, fuzzy, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr "Copying VHD %(src_vhd_path)s to %(dest_vhd_path)s"
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8323,12 +8359,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Using config drive"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "Creating config drive at %(path)s"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "Creating config drive at %(path)s"
@@ -8487,7 +8523,7 @@ msgstr "Detach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Creating snapshot for instance %s"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr "Could not determine iscsi initiator name"
 
@@ -8555,181 +8591,181 @@ msgstr "Can not handle authentication request for %d credentials"
 msgid "Connection to libvirt failed: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr "During wait destroy, instance disappeared."
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr "Instance destroyed successfully."
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Going to stop instances"
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr "Error from libvirt during undefineFlags. Retrying with undefine"
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr "Deleting instance files %(target)s"
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr "Failed to cleanup directory %(target)s: %(e)s"
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 #, fuzzy
 msgid "Could not determine fibre channel world wide node names"
 msgstr "Could not determine iscsi initiator name"
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 #, fuzzy
 msgid "Could not determine fibre channel world wide port names"
 msgstr "Could not determine iscsi initiator name"
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr "During detach_volume, instance disappeared."
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "No networks defined."
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 #, fuzzy
 msgid "During detach_interface, instance disappeared."
 msgstr "During detach_volume, instance disappeared."
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "No networks defined."
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 msgid "Instance soft rebooted successfully."
 msgstr "Instance soft rebooted successfully."
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 msgid "Failed to soft reboot instance."
 msgstr "Failed to soft reboot instance."
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr "Instance shutdown successfully."
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr "Instance rebooted successfully."
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr "Instance is running"
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr "Instance spawned successfully."
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 msgid "Guest does not have a console available"
 msgstr "Guest does not have a console available"
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr "Path '%(path)s' supports direct I/O"
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr "Creating image"
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr "Using config drive"
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Injecting %(injection)s into image %(img_id)s"
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, fuzzy, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
@@ -8738,20 +8774,20 @@ msgstr ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr "Config requested a custom CPU model, but no model name was provided"
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr "A CPU model name should not be set when a host CPU model is requested"
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr "CPU mode '%(mode)s' model '%(model)s' was chosen"
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
@@ -8759,7 +8795,7 @@ msgstr ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8767,12 +8803,12 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -8781,27 +8817,27 @@ msgstr ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, fuzzy, python-format
 msgid "Invalid exclusion expression %r"
 msgstr "Invalid reservation expiration %(expire)s."
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, fuzzy, python-format
 msgid "Invalid inclusion expression %r"
 msgstr "Invalid reservation expiration %(expire)s."
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 #, fuzzy
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
@@ -8810,35 +8846,35 @@ msgstr ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "libvirt version is too old (does not support getVersion)"
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Getting image size for the image %s"
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8846,21 +8882,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -8869,15 +8905,15 @@ msgstr ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr "Block migration can not be used with shared storage."
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr "Live migration can not be used without shared storage."
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
@@ -8886,7 +8922,7 @@ msgstr ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -8895,7 +8931,7 @@ msgstr ""
 "Instance launched has CPU info:\n"
 "%s"
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8910,7 +8946,7 @@ msgstr ""
 "\n"
 "Refer to %(u)s"
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -8919,22 +8955,22 @@ msgstr ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr "The firewall filter for %s does not exist"
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "Live Migration failure: %(e)s"
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, fuzzy, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, fuzzy, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
@@ -8943,38 +8979,38 @@ msgstr ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr "skipping %(path)s since it looks like volume"
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr "Getting disk size of %(i_name)s: %(e)s"
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr "Starting migrate_disk_and_power_off"
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr "Instance running successfully."
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr "Starting finish_migration"
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr "Starting finish_revert_migration"
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, fuzzy, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr "Deleting instance files %(target)s"
@@ -9009,46 +9045,46 @@ msgstr "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptables firewall: Setup Basic Filtering"
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr "You should specify libvirt_images_volume_group flag to use LVM images."
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr "Unknown image_type=%s"
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr "Error reading image info file %(filename)s: %(error)s"
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr "Reading image info file: %s"
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, fuzzy, python-format
 msgid "Writing stored info to %s"
 msgstr "Writing image info file: %s"
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr "%s is a valid instance name"
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr "%s has a disk file"
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr "Instance %(instance)s is backed by %(backing)s"
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
@@ -9057,49 +9093,49 @@ msgstr ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, fuzzy, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr "%(id)s (%(base_file)s): image verification failed"
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, fuzzy, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr "%(id)s (%(base_file)s): checking"
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr "Cannot remove %(base_file)s, it does not exist"
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr "Base file too young to remove: %s"
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr "Removing base file: %s"
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr "Failed to remove %(base_file)s, error was %(error)s"
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, fuzzy, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr "%(id)s (%(base_file)s): checking"
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, fuzzy, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
@@ -9108,7 +9144,7 @@ msgstr ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, fuzzy, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
@@ -9117,51 +9153,51 @@ msgstr ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, fuzzy, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr "%(id)s (%(base_file)s): image is not in use"
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, fuzzy, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr "%(id)s (%(base_file)s): image is in use"
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr "Skipping verification, no base directory at %s"
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr "Verify base images"
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr "Image id %(id)s yields fingerprint %(fingerprint)s"
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr "Unknown base file: %s"
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr "Active base files: %s"
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr "Corrupt base files: %s"
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr "Removable base files: %s"
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr "Verification complete"
 
@@ -9279,12 +9315,12 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr "iSCSI device not found at %s"
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, fuzzy, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
@@ -9293,48 +9329,48 @@ msgstr ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, fuzzy, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, python-format
 msgid "%s is already mounted"
 msgstr "%s is already mounted"
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, fuzzy, python-format
 msgid "AoE device not found at %s"
 msgstr "iSCSI device not found at %s"
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, fuzzy, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, fuzzy, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 #, fuzzy
 msgid "Fibre Channel device not found."
 msgstr "iSCSI device not found at %s"
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, fuzzy, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
@@ -9343,30 +9379,30 @@ msgstr ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, fuzzy, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9439,35 +9475,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr "Uncompressed image file not found"
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr "Connection error connecting PowerVM manager"
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, fuzzy, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr "Running cmd (subprocess): %s"
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr "File transfer to PowerVM manager failed"
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 #, fuzzy
 msgid "File transfer from PowerVM manager failed"
 msgstr "File transfer to PowerVM manager failed"
@@ -9563,74 +9599,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, python-format
 msgid "LPAR instance '%s' not found"
 msgstr "LPAR instance '%s' not found"
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr "PowerVM image creation failed: %s"
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr "Creating LPAR instance '%s'"
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr "LPAR instance '%s' creation failed"
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr "Activating the LPAR instance '%s'"
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, python-format
 msgid "Instance '%s' failed to boot"
 msgstr "Instance '%s' failed to boot"
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, fuzzy, python-format
 msgid "Instance spawned in %s seconds"
 msgstr "instance %s spawned successfully"
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr "During destroy, LPAR instance '%s' was not found on PowerVM system."
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, fuzzy, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr "instance snapshotting"
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, python-format
 msgid "Shutting down the instance '%s'"
 msgstr "Shutting down the instance '%s'"
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr "Deleting the LPAR instance '%s'"
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr "PowerVM instance cleanup failed"
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr "Not enough free memory in the host"
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr "Insufficient available CPU on PowerVM"
 
@@ -10126,7 +10162,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
@@ -10288,12 +10324,12 @@ msgstr "Failed to find volume in db"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -10302,7 +10338,7 @@ msgstr ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr "The call to %(method)s returned an error: %(e)s. args=%(args)r"
@@ -10415,24 +10451,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr "Failure while cleaning up attached VDIs"
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, python-format
 msgid "Could not determine key: %s"
 msgstr "Could not determine key: %s"
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr "Host startup on XenServer is not supported."
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr "Unable to log in to XenAPI (is the Dom0 disk full?)"
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr "Host is member of a pool, but DB says otherwise"
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr "Got exception: %s"
@@ -10577,74 +10613,74 @@ msgstr ""
 "PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr "Created VM"
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr "VM destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr "VM already halted, skipping shutdown..."
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 #, fuzzy
 msgid "Shutting down VM (cleanly)"
 msgstr "Shutting down VM"
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, fuzzy
 msgid "Shutting down VM (hard)"
 msgstr "Shutting down VM"
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD not found in instance %s"
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, python-format
 msgid "VBD %s already detached"
 msgstr "VBD %s already detached"
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Unable to unplug VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr "Reached maximum number of retries trying to unplug VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr "Unable to destroy VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -10653,35 +10689,35 @@ msgstr ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 msgid "SR not present and could not be introduced"
 msgstr "SR not present and could not be introduced"
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr "block device info: %s"
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr "No primary VDI found for %(vm_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 msgid "Starting snapshot for VM"
 msgstr "Starting snapshot for VM"
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr "Destroying cached VDI '%(vdi_uuid)s'"
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
@@ -10690,17 +10726,17 @@ msgstr ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr "Unrecognized cache_images value '%s', defaulting to True"
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
@@ -10709,32 +10745,32 @@ msgstr ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr "download_vhd failed: %r"
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr "Invalid value '%s' for xenapi_torrent_images"
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr "Asking xapi to fetch vhd image %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
@@ -10743,17 +10779,17 @@ msgstr ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "Fetching image %(image_id)s, type %(image_type_str)s"
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Size for image %(image_id)s: %(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
@@ -10762,63 +10798,63 @@ msgstr ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copying VDI %s to /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 msgid "Failed to fetch glance image"
 msgstr "Failed to fetch glance image"
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr "Detected %(image_type_str)s format for image %(image_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Looking up vdi %s for PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr "Unknown image format %(disk_image_type)s"
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s is still available"
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr "Unable to parse rrd of %(vm_uuid)s"
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-scanning SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr "Flag sr_matching_filter '%s' does not respect formatting convention"
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
@@ -10828,50 +10864,50 @@ msgstr ""
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr "Cannot find SR of content-type ISO"
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr "ISO: looking at SR %(sr_rec)s"
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr "ISO: not iso content"
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr "ISO: iso content_type, no 'i18n-key' key"
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr "ISO: SR MATCHing our criteria"
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr "ISO: ISO, looking to see if it is host local"
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr "ISO: PBD %(pbd_ref)s disappeared"
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr "ISO: SR with local PBD"
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
@@ -10880,22 +10916,22 @@ msgstr ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr "Unable to obtain RRD XML updates with server details: %(server)s."
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr "Invalid statistics data from Xenserver: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -10904,66 +10940,66 @@ msgstr ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "Timeout waiting for device %s to be created"
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr "Disconnecting stale VDI %s from compute domU"
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Plugging VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Plugging VBD %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destroying VBD for VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destroying VBD for VDI %s done."
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Running pygrub against %s"
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Found Xen kernel %s"
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "No Xen kernel found.  Booting HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10971,16 +11007,16 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr "Partitions:"
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d sectors"
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
@@ -10989,12 +11025,19 @@ msgstr ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Writing partition table %s done."
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
@@ -11003,7 +11046,7 @@ msgstr ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
@@ -11012,20 +11055,20 @@ msgstr ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr "Manipulating interface files directly"
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr "Failed to mount filesystem (expected for non-linux instances): %s"
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr "This domU must be running on the host specified by xenapi_connection_url"
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr "Updating progress to %(progress)d"
@@ -11039,36 +11082,36 @@ msgstr "Writing image info file: %s"
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 msgid "Starting instance"
 msgstr "Starting instance"
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr "Removing kernel/ramdisk files from dom0"
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr "Block device information present: %s"
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 msgid "Failed to spawn, rolling back"
 msgstr "Failed to spawn, rolling back"
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr "Auto configuring disk, attempting to resize partition..."
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 msgid "Starting VM"
 msgstr "Starting VM"
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr "Waiting for instance state to become running"
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
@@ -11077,136 +11120,146 @@ msgstr ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr "Instance agent version: %s"
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr "Setting VCPU weight"
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr "Could not find VM with name %s"
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 msgid "Finished snapshot and upload for VM"
 msgstr "Finished snapshot and upload for VM"
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr "Failed to transfer vhd to new host"
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
-msgstr "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+#, fuzzy
+msgid "Unable to terminate instance."
+msgstr "Failed to terminate instance"
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr "Resize complete"
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr "Starting halted instance found during reboot"
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr "Unable to find root VBD/VDI for VM"
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 #, fuzzy
 msgid "Destroying VDIs"
 msgstr "Destroying VM"
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr "Using RAW or VHD, skipping kernel and ramdisk deletion"
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr "instance has a kernel or ramdisk but not both"
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr "kernel/ramdisk files removed"
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 msgid "Destroying VM"
 msgstr "Destroying VM"
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr "VM is not present, skipping destroy..."
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr "Instance is already in Rescue Mode: %s"
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 #, fuzzy
 msgid "VM is not present, skipping soft delete..."
 msgstr "VM is not present, skipping destroy..."
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr "Automatically hard rebooting"
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 msgid "Injecting network info to xenstore"
 msgstr "Injecting network info to xenstore"
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr "Creating vifs"
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Creating VIF for network %(network_ref)s"
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Created VIF %(vif_ref)s, network %(network_ref)s"
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr "Injecting hostname to xenstore"
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
@@ -11215,25 +11268,25 @@ msgstr ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 #, fuzzy
 msgid "No suitable network for migrate"
 msgstr "Bad networks format"
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr "Migrate Receive failed"
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 #, fuzzy
 msgid "VM.assert_can_migrate failed"
 msgstr "VM.assert_can_migratefailed"
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr "Migrate Send failed"
 
@@ -11363,18 +11416,26 @@ msgstr "Unexpected error: %s"
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr "Starting nova-xvpvncproxy node (version %s)"
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr "Cinderclient connection created using URL: %s"
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 #, fuzzy
 msgid "status must be 'in-use'"
 msgstr "status must be available"
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 #, fuzzy
 msgid "status must be 'available'"
 msgstr "status must be available"
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr "%(flag)s : FLAG SET "
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr ""
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
+
diff --git a/nova/locale/es/LC_MESSAGES/nova.po b/nova/locale/es/LC_MESSAGES/nova.po
index d46bad9a2..a5bee8419 100644
--- a/nova/locale/es/LC_MESSAGES/nova.po
+++ b/nova/locale/es/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+0000\n"
 "PO-Revision-Date: 2012-05-16 06:44+0000\n"
 "Last-Translator: Paco Molinero <paco@byasl.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -88,7 +88,7 @@ msgstr "Ruta a las opciones: %s"
 msgid "An unknown exception occurred."
 msgstr "Una excepcion desconocida ha ocurrido"
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -174,8 +174,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "Firma invalida para el usuario %s"
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Rango de puertos invalido %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Protocolo IP invalido %(protocol)s"
@@ -1250,55 +1250,67 @@ msgstr ""
 
 #: nova/exception.py:1157
 #, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "La instancia %(instance_id)s no esta en modo de rescate"
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "La instancia %(instance_id)s no esta en modo de rescate"
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1309,7 +1321,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1330,206 +1342,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-#, fuzzy
-msgid "Full set of CONF:"
-msgstr "Conjunto completo de opciones (FLAGS):"
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, fuzzy, python-format
-msgid "Starting %d workers"
-msgstr "configurando la red del host"
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "Se detuvo un servicio sin entrada en la base de datos"
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr "corriendo cmd (SSH): %s"
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr "El resultado fue %s"
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr "Depuración de la devolución de llamada: %s"
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "No se encuentra la dirección del enlace local.:%s"
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "No se pudo obtener enlace de la ip local de %(interface)s :%(ex)s"
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "backend inválido: %s"
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1614,131 +1545,126 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr "Demasiados intentos de autenticacion fallidos."
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "Fallo de autenticación: %s"
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "Demasiados intentos de autenticacion fallidos."
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr "acción: %s"
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "No encontrado: %s"
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "Sucedió un error inexperado: %s"
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Sucedió un error inexperado: %s"
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "Ha sucedido un error desconocido. Por favor repite el intento de nuevo."
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
@@ -1748,69 +1674,74 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr "Creando par de claves %s"
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Borrar para de claves %s"
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, fuzzy, python-format
+msgid "Invalid IP protocol %s."
+msgstr "Protocolo IP invalido %(protocol)s"
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr "No hay regla para los parámetros especificados."
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Esta regla ya existe en el grupo %s"
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Crear volumen de %s GB"
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
@@ -1819,7 +1750,7 @@ msgstr ""
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Desasociar volumen %s"
@@ -1830,7 +1761,7 @@ msgid "Detach Volume Failed."
 msgstr "Desasociar volumen %s"
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "atributo no soportado: %s"
@@ -1862,140 +1793,140 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Desasociar dirección %s"
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Desasociar dirección %s"
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Desasociar dirección %s"
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reiniciar instancia %r"
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr "Des-registrando la imagen %s"
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr "usuario o grupo no especificado"
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr "sólo el grupo \"all\" está soportado"
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr "operation_type debe ser añadir o eliminar"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Actualizando imagen %s públicamente"
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instancia %s: rescatada"
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "Cidr %(cidr)s invalido"
@@ -2037,11 +1968,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, fuzzy, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr "Fallo al generar metadatos para la ip %s"
@@ -2060,19 +1991,19 @@ msgstr ""
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -2084,63 +2015,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:364
+#: nova/api/openstack/common.py:366
 #, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -2194,14 +2125,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
 #: nova/api/openstack/extensions.py:370
 #, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2244,13 +2175,13 @@ msgstr ""
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr ""
 
@@ -2259,20 +2190,20 @@ msgstr ""
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, fuzzy, python-format
 msgid "Calling method %s"
 msgstr "Llanado al adquiridor %s"
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2285,12 +2216,12 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2298,17 +2229,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, fuzzy, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr "Firma invalida para el usuario %s"
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, fuzzy, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr "Firma invalida para el usuario %s"
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2373,215 +2304,215 @@ msgstr ""
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 #, fuzzy
 msgid "Only administrators may list deleted instances"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, fuzzy, python-format
 msgid "Flavor '%s' could not be found "
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "Punto de montaje no puede ser traducido: %s"
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "Punto de montaje no puede ser traducido: %s"
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2589,9 +2520,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
+#: nova/api/openstack/compute/servers.py:1408
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+msgid "Removing options '%s' from query"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2678,7 +2609,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2698,17 +2629,17 @@ msgstr "compute.api::resume %s"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2866,15 +2797,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
@@ -2984,7 +2915,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3018,29 +2949,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Llanado al adquiridor %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Llanado al adquiridor %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3266,33 +3197,33 @@ msgstr ""
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, fuzzy, python-format
 msgid "Instance %s is not attached."
 msgstr "instancia %s: arrancada"
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3311,94 +3242,94 @@ msgstr "Liberar dirección %s"
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "no hay método para el mensaje: %s"
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "no hay método para el mensaje: %s"
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, fuzzy, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+msgid "Got update for instance: %(instance)s"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/cells/messaging.py:838
+#: nova/cells/messaging.py:862
 #, fuzzy, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+msgid "Got update to delete instance"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3415,7 +3346,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "La instacia %(instance_id)s no esta suspendida"
@@ -3429,7 +3360,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3456,7 +3387,7 @@ msgstr "Mascara de red a insertar en la configuración de openvpn"
 msgid "Launching VPN for %s"
 msgstr "Lanzando VPN para %s"
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, fuzzy, python-format
 msgid "Failed to load %s"
 msgstr "Imposible encontrar volumen %s"
@@ -3476,277 +3407,277 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 #, fuzzy
 msgid "Reserved"
 msgstr "recibido %s"
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Capturado error: %s"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 #, fuzzy
 msgid "network"
 msgstr "configurando la red del host"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 #, fuzzy
 msgid "IP address"
 msgstr "Asignar dirección"
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "el grupo %s ya existe"
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 #, fuzzy
 msgid "No networks found"
 msgstr "configurando la red del host"
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 #, fuzzy
 msgid "instance"
 msgstr "Reiniciar instancia %r"
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "Sucedió un error inexperado: %s"
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3827,255 +3758,255 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr ""
 "Quota de instancias superada. Sólo puedes ejecutar %s instancias más de "
 "este tipo."
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 "Quota de instancias superada. Sólo puedes ejecutar %s instancias más de "
 "este tipo."
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Imposible adjuntar volumen a la instancia %s"
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Comenzando snapshot para la VM %s"
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Crear Grupo de Seguridad %s"
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Imposible destruir VBD %s"
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revocar ingreso al grupo de seguridad %s"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Autorizar ingreso al grupo de seguridad %s"
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revocar ingreso al grupo de seguridad %s"
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4110,84 +4041,84 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
@@ -4196,647 +4127,652 @@ msgstr ""
 "Incapaz de emigrar la instancia %(instance_id)s al actual anfitrion "
 "(%(host)s)"
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Sucedió un error inexperado: %s"
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Capturado error: %s"
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Reiniciando instancia %s"
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Desasociar volumen %s"
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Reiniciando instancia %s"
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "Ejecutando instancias: %s"
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instancia %s: reiniciada"
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instancia %s: creando snapshot"
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Capturado error: %s"
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "instancia %s: creando snapshot"
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instancia %s: obteniendo los diagnosticos"
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 #, fuzzy
 msgid "Reset network"
 msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 #, fuzzy
 msgid "Inject network info"
 msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 #, fuzzy
 msgid "Get console output"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Desvinculando volumen de instancia desconocida %s"
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, fuzzy, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr "instancia %s: arrancada"
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, fuzzy, python-format
 msgid "Host %(host)s not found"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Fallo al generar metadatos para la ip %s"
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Borrando usuario %s"
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instancia %s: arrancada"
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Borrando usuario %s"
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, fuzzy, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr "Tipo de instancia inválido %(instance_type)s."
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -4946,7 +4882,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -4957,7 +4893,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5037,56 +4973,52 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 #, fuzzy
 msgid "Failed to notify cells of instance update"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 #, fuzzy
 msgid "Failed to notify cells of instance fault"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instancia %s: rescatada"
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5103,51 +5035,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5232,16 +5164,20 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 #, fuzzy
 msgid "Failed storing info cache"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -5355,103 +5291,103 @@ msgstr ""
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, fuzzy, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr "El pid %d está pasado, relanzando dnsmasq"
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Excepción al recargar la configuración de dnsmasq: %s"
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "El pid %d está pasado, relanzando dnsmasq"
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "Matando radvd lanzado %s"
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d corrupto, relanzando radvd"
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "backend inválido: %s"
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Iniciando interfaz VLAN %s"
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Iniciando interfaz puente para %s"
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Iniciando interfaz puente para %s"
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Des-registrando la imagen %s"
@@ -5546,38 +5482,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5613,7 +5549,7 @@ msgstr "recibido %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5696,68 +5632,68 @@ msgstr "configurando la red del host"
 msgid "Quantum Error creating security group %s"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Capturado error: %s"
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Revocar ingreso al grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Capturado error: %s"
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Autorizar ingreso al grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5774,27 +5710,27 @@ msgstr "Esta regla ya existe en el grupo %s"
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5804,17 +5740,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr "recibido %s"
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5887,11 +5823,92 @@ msgstr ""
 msgid "Running cmd (subprocess): %s"
 msgstr "Ejecutando cmd (subprocesos): %s"
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr "El resultado fue %s"
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr "corriendo cmd (SSH): %s"
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+#, fuzzy
+msgid "Full set of CONF:"
+msgstr "Conjunto completo de opciones (FLAGS):"
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, fuzzy, python-format
+msgid "Starting %d workers"
+msgstr "configurando la red del host"
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr "excepción DB empaquetada."
@@ -6030,58 +6047,63 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 #, fuzzy
 msgid "An unknown RPC related exception occurred."
 msgstr "Una excepcion desconocida ha ocurrido"
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr "Reuso invalido de una coneccion RPC"
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -6401,7 +6423,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6410,36 +6432,48 @@ msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, fuzzy, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr "La instacia %(instance_id)s no esta suspendida"
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:357
+#: nova/scheduler/filter_scheduler.py:361
 #, python-format
-msgid "Choosing host %(chosen_host)s"
+msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6636,46 +6670,46 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr "Recuperada la conexión al servidor de modelos."
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr "el servidor de modelos se ha ido"
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 msgid "memcached_servers not defined"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6728,58 +6762,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr "Intento de instanciar sigleton"
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 #, fuzzy
 msgid "fake vswitch not found"
@@ -6814,17 +6832,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6833,7 +6851,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr "Ejecutando instancias: %s"
@@ -6850,16 +6868,16 @@ msgstr "Después de terminar las instancias: %s"
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 msgid "spawn error"
 msgstr ""
 
@@ -6955,6 +6973,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -6979,11 +7013,10 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -7109,19 +7142,19 @@ msgstr ""
 "Stdout: %(stdout)r\n"
 "Stderr: %(stderr)r"
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7289,15 +7322,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7355,97 +7388,97 @@ msgstr ""
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, fuzzy, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr "Fallo al montar el sistema de ficheros: %s"
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, fuzzy, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr "Fallo al montar el sistema de ficheros: %s"
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7782,7 +7815,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7797,24 +7830,24 @@ msgstr "Obtener salida de la consola para la instancia %s"
 msgid "Host IP address is: %s"
 msgstr "Liberar dirección %s"
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8138,12 +8171,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8309,7 +8342,7 @@ msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Creando una instancia raw"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8377,205 +8410,205 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr "Conectando a libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "instancia %s: reiniciada"
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "El usuario no tiene privilegios de administrador"
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Pidiendo xapi a subir %(vdi_uuids)s como ID %(image_id)s"
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8583,73 +8616,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Fallo al generar metadatos para la ip %s"
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8657,50 +8690,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8710,67 +8743,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "Fallo de autenticación: %s"
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8803,153 +8836,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, fuzzy, python-format
 msgid "Writing stored info to %s"
 msgstr "Iniciando interfaz puente para %s"
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -9062,87 +9095,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, fuzzy, python-format
 msgid "%s is already mounted"
 msgstr "el grupo %s ya existe"
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9216,35 +9249,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, fuzzy, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr "Ejecutando cmd (subprocesos): %s"
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 #, fuzzy
 msgid "File transfer from PowerVM manager failed"
 msgstr "Falló la conexión a melange"
@@ -9337,74 +9370,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, fuzzy, python-format
 msgid "LPAR instance '%s' not found"
 msgstr "instancia %s: arrancada"
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, fuzzy, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr "Iniciando interfaz puente para %s"
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, fuzzy, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr "Creando una instancia raw"
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, fuzzy, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr "instancia %s: Creando imagen"
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, fuzzy, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr "Creando una instancia raw"
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, fuzzy, python-format
 msgid "Instance '%s' failed to boot"
 msgstr "instancia %s: reiniciada"
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, fuzzy, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr "instancia %s: creando snapshot"
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, fuzzy, python-format
 msgid "Shutting down the instance '%s'"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, fuzzy, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9866,7 +9899,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -10030,19 +10063,19 @@ msgstr ""
 "El punto de montaje %(mountpoint)s se desligó de la instancia "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -10149,24 +10182,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr "Obtenida excepción %s"
@@ -10305,72 +10338,72 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD no encontrado en la instancia %s"
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "el grupo %s ya existe"
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Imposible desconectar VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Imposible destruir VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Creado el VBD %(vbd_ref)s para VM %(vm_ref)s, VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Creado el VBD %(vbd_ref)s para VM %(vm_ref)s, VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -10379,304 +10412,304 @@ msgstr ""
 "VDI creado %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) "
 "sobre %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "Comenzando snapshot para la VM %s"
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, fuzzy, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr "Pidiendo xapi a subir %(vdi_uuids)s como ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Tamaño para imagen %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copiando VDI %s a /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destruído"
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Buscando vid %s para el kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s está todavía disponible"
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-escaneando SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s tiene origen en %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Ejecutando pygrub contra %s"
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen Encontrado %s"
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Kernel Xen no encontrado. Reiniciando HVM"
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10684,55 +10717,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -10746,197 +10786,207 @@ msgstr "Iniciando interfaz puente para %s"
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 #, fuzzy
 msgid "Starting instance"
 msgstr "Creando una instancia raw"
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "Finalizado el snapshot y la subida de la VM %s"
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+#, fuzzy
+msgid "Unable to terminate instance."
+msgstr "Fallo a reinicia la instancia"
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "configurando la red del host"
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Creando VIF para VM %(vm_ref)s, red %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Creando VIF para VM %(vm_ref)s, red %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -11065,16 +11115,25 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 msgid "status must be 'in-use'"
 msgstr ""
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr "La instacia %(instance_id)s no esta suspendida"
+
diff --git a/nova/locale/fi_FI/LC_MESSAGES/nova.po b/nova/locale/fi_FI/LC_MESSAGES/nova.po
new file mode 100644
index 000000000..42174063e
--- /dev/null
+++ b/nova/locale/fi_FI/LC_MESSAGES/nova.po
@@ -0,0 +1,10978 @@
+# English (United States) translations for nova.
+# Copyright (C) 2012 ORGANIZATION
+# This file is distributed under the same license as the nova project.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version:  Nova\n"
+"Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
+"POT-Creation-Date: 2013-05-22 19:37+0000\n"
+"PO-Revision-Date: 2013-05-18 19:07+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language-Team: Finnish (Finland) "
+"(http://www.transifex.com/projects/p/openstack/language/fi_FI/)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#: nova/block_device.py:167 nova/virt/hyperv/basevolumeutils.py:91
+#, python-format
+msgid "block_device_list %s"
+msgstr ""
+
+#: nova/context.py:63
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:108
+#, python-format
+msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
+msgstr ""
+
+#: nova/crypto.py:55
+msgid "Filename of root CA"
+msgstr ""
+
+#: nova/crypto.py:58
+msgid "Filename of private key"
+msgstr ""
+
+#: nova/crypto.py:61
+msgid "Filename of root Certificate Revocation List"
+msgstr ""
+
+#: nova/crypto.py:64
+msgid "Where we keep our keys"
+msgstr ""
+
+#: nova/crypto.py:67
+msgid "Where we keep our root CA"
+msgstr ""
+
+#: nova/crypto.py:70
+msgid "Should we use a CA for each project?"
+msgstr ""
+
+#: nova/crypto.py:74
+#, python-format
+msgid "Subject for certificate for users, %s for project, user, timestamp"
+msgstr ""
+
+#: nova/crypto.py:79
+#, python-format
+msgid "Subject for certificate for projects, %s for project, timestamp"
+msgstr ""
+
+#: nova/crypto.py:210
+msgid "Unable to find the key"
+msgstr ""
+
+#: nova/crypto.py:393
+msgid "Failed to write inbound.csr"
+msgstr ""
+
+#: nova/crypto.py:395
+#, python-format
+msgid "Flags path: %s"
+msgstr ""
+
+#: nova/exception.py:112
+msgid "An unknown exception occurred."
+msgstr ""
+
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+msgid "Exception in string format operation"
+msgstr ""
+
+#: nova/exception.py:153
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:163
+#, python-format
+msgid "Failed to encrypt text: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:167
+#, python-format
+msgid "Failed to decrypt text: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:171
+msgid "Virtual Interface creation failed"
+msgstr ""
+
+#: nova/exception.py:175
+msgid "5 attempts to create virtual interfacewith unique mac address failed"
+msgstr ""
+
+#: nova/exception.py:180
+#, python-format
+msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:185
+msgid "Not authorized."
+msgstr ""
+
+#: nova/exception.py:190
+msgid "User does not have admin privileges"
+msgstr ""
+
+#: nova/exception.py:194
+#, python-format
+msgid "Policy doesn't allow %(action)s to be performed."
+msgstr ""
+
+#: nova/exception.py:198
+#, python-format
+msgid "Image %(image_id)s is not active."
+msgstr ""
+
+#: nova/exception.py:202
+#, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr ""
+
+#: nova/exception.py:206
+msgid "Unacceptable parameters."
+msgstr ""
+
+#: nova/exception.py:211
+msgid "Block Device Mapping is Invalid."
+msgstr ""
+
+#: nova/exception.py:215
+#, python-format
+msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
+msgstr ""
+
+#: nova/exception.py:220
+#, python-format
+msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
+msgstr ""
+
+#: nova/exception.py:225
+#, python-format
+msgid "Volume %(volume_id)s is not attached to anything"
+msgstr ""
+
+#: nova/exception.py:229
+#, python-format
+msgid ""
+"Volume %(volume_id)s did not finish being created even after we waited "
+"%(seconds)s seconds or %(attempts)s attempts."
+msgstr ""
+
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
+msgid "Keypair data is invalid"
+msgstr ""
+
+#: nova/exception.py:239
+msgid "The request is invalid."
+msgstr ""
+
+#: nova/exception.py:243
+msgid "Invalid input received"
+msgstr ""
+
+#: nova/exception.py:247
+msgid "Invalid volume"
+msgstr ""
+
+#: nova/exception.py:251 nova/api/openstack/compute/servers.py:1332
+#: nova/api/openstack/compute/contrib/admin_actions.py:242
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/exception.py:255
+msgid "Invalid metadata size"
+msgstr ""
+
+#: nova/exception.py:259
+#, python-format
+msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
+msgstr ""
+
+#: nova/exception.py:263
+#, python-format
+msgid "Invalid IP protocol %(protocol)s."
+msgstr ""
+
+#: nova/exception.py:267
+#, python-format
+msgid "Invalid content type %(content_type)s."
+msgstr ""
+
+#: nova/exception.py:271
+#, python-format
+msgid "Invalid cidr %(cidr)s."
+msgstr ""
+
+#: nova/exception.py:275 nova/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: nova/exception.py:282
+#, python-format
+msgid "%(err)s"
+msgstr ""
+
+#: nova/exception.py:286
+#, python-format
+msgid ""
+"Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
+" %(reason)s."
+msgstr ""
+
+#: nova/exception.py:291
+#, python-format
+msgid "Group not valid. Reason: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:295 nova/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: nova/exception.py:299
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
+" the instance is in this state."
+msgstr ""
+
+#: nova/exception.py:304
+#, python-format
+msgid "Instance %(instance_id)s is not running."
+msgstr ""
+
+#: nova/exception.py:308
+#, python-format
+msgid "Instance %(instance_id)s is not in rescue mode"
+msgstr ""
+
+#: nova/exception.py:312
+#, python-format
+msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:316
+#, python-format
+msgid "Instance %(instance_id)s is not ready"
+msgstr ""
+
+#: nova/exception.py:320
+msgid "Failed to suspend instance"
+msgstr ""
+
+#: nova/exception.py:324
+#, python-format
+msgid "Failed to resume instance: %(reason)s."
+msgstr ""
+
+#: nova/exception.py:328
+#, python-format
+msgid "Failed to power on instance: %(reason)s."
+msgstr ""
+
+#: nova/exception.py:332
+#, python-format
+msgid "Failed to power off instance: %(reason)s."
+msgstr ""
+
+#: nova/exception.py:336
+msgid "Failed to reboot instance"
+msgstr ""
+
+#: nova/exception.py:340
+msgid "Failed to terminate instance"
+msgstr ""
+
+#: nova/exception.py:344
+msgid "Failed to deploy instance"
+msgstr ""
+
+#: nova/exception.py:348
+msgid "Service is unavailable at this time."
+msgstr ""
+
+#: nova/exception.py:352
+msgid "Insufficient compute resources."
+msgstr ""
+
+#: nova/exception.py:356
+#, python-format
+msgid "Compute service of %(host)s is unavailable at this time."
+msgstr ""
+
+#: nova/exception.py:360
+#, python-format
+msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
+msgstr ""
+
+#: nova/exception.py:365
+msgid "The supplied hypervisor type of is invalid."
+msgstr ""
+
+#: nova/exception.py:369
+msgid "The instance requires a newer hypervisor version than has been provided."
+msgstr ""
+
+#: nova/exception.py:374
+#, python-format
+msgid ""
+"The supplied disk path (%(path)s) already exists, it is expected not to "
+"exist."
+msgstr ""
+
+#: nova/exception.py:379
+#, python-format
+msgid "The supplied device path (%(path)s) is invalid."
+msgstr ""
+
+#: nova/exception.py:383
+#, python-format
+msgid "The supplied device path (%(path)s) is in use."
+msgstr ""
+
+#: nova/exception.py:388
+#, python-format
+msgid "The supplied device (%(device)s) is busy."
+msgstr ""
+
+#: nova/exception.py:392
+msgid "Unacceptable CPU info"
+msgstr ""
+
+#: nova/exception.py:396
+#, python-format
+msgid "%(address)s is not a valid IP v4/6 address."
+msgstr ""
+
+#: nova/exception.py:400
+#, python-format
+msgid ""
+"VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
+"tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
+msgstr ""
+
+#: nova/exception.py:406
+#, python-format
+msgid ""
+"vSwitch which contains the port group %(bridge)s is not associated with "
+"the desired physical adapter. Expected vSwitch is %(expected)s, but the "
+"one associated is %(actual)s."
+msgstr ""
+
+#: nova/exception.py:413
+#, python-format
+msgid "Disk format %(disk_format)s is not acceptable"
+msgstr ""
+
+#: nova/exception.py:417
+#, python-format
+msgid "Image %(image_id)s is unacceptable: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:421
+#, python-format
+msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:425
+#, python-format
+msgid "Ec2 id %(ec2_id)s is unacceptable."
+msgstr ""
+
+#: nova/exception.py:429
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
+msgstr ""
+
+#: nova/exception.py:433
+#, python-format
+msgid "Invalid ID received %(id)s."
+msgstr ""
+
+#: nova/exception.py:437
+msgid "Constraint not met."
+msgstr ""
+
+#: nova/exception.py:442
+msgid "Resource could not be found."
+msgstr ""
+
+#: nova/exception.py:447
+#, python-format
+msgid "No agent-build associated with id %(id)s."
+msgstr ""
+
+#: nova/exception.py:451
+#, python-format
+msgid "Volume %(volume_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:455
+#, python-format
+msgid "Snapshot %(snapshot_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:459
+#, python-format
+msgid "No target id found for volume %(volume_id)s."
+msgstr ""
+
+#: nova/exception.py:463
+#, python-format
+msgid "No disk at %(location)s"
+msgstr ""
+
+#: nova/exception.py:467
+#, python-format
+msgid "Could not find a handler for %(driver_type)s volume."
+msgstr ""
+
+#: nova/exception.py:471
+#, python-format
+msgid "Invalid image href %(image_href)s."
+msgstr ""
+
+#: nova/exception.py:475
+#, python-format
+msgid "Image %(image_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:479
+#, python-format
+msgid ""
+"Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
+" dynamically when they are listed for the first time. Have you listed "
+"image ids since adding this image?"
+msgstr ""
+
+#: nova/exception.py:486
+#, python-format
+msgid "Project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:490
+msgid "Cannot find SR to read/write VDI."
+msgstr ""
+
+#: nova/exception.py:494
+#, python-format
+msgid "Network %(network_id)s is duplicated."
+msgstr ""
+
+#: nova/exception.py:498
+#, python-format
+msgid "Network %(network_id)s is still in use."
+msgstr ""
+
+#: nova/exception.py:502
+#, python-format
+msgid "%(req)s is required to create a network."
+msgstr ""
+
+#: nova/exception.py:506
+#, python-format
+msgid "Network %(network_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:510
+#, python-format
+msgid "Port id %(port_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:514
+#, python-format
+msgid "Network could not be found for bridge %(bridge)s"
+msgstr ""
+
+#: nova/exception.py:518
+#, python-format
+msgid "Network could not be found for uuid %(uuid)s"
+msgstr ""
+
+#: nova/exception.py:522
+#, python-format
+msgid "Network could not be found with cidr %(cidr)s."
+msgstr ""
+
+#: nova/exception.py:526
+#, python-format
+msgid "Network could not be found for instance %(instance_id)s."
+msgstr ""
+
+#: nova/exception.py:530
+msgid "No networks defined."
+msgstr ""
+
+#: nova/exception.py:534
+#, python-format
+msgid ""
+"Either Network uuid %(network_uuid)s is not present or is not assigned to"
+" the project %(project_id)s."
+msgstr ""
+
+#: nova/exception.py:539
+msgid "Could not find the datastore reference(s) which the VM uses."
+msgstr ""
+
+#: nova/exception.py:543
+#, python-format
+msgid "Port %(port_id)s is still in use."
+msgstr ""
+
+#: nova/exception.py:547
+#, python-format
+msgid "Port %(port_id)s not usable for instance %(instance)s."
+msgstr ""
+
+#: nova/exception.py:551
+#, python-format
+msgid "No free port available for instance %(instance)s."
+msgstr ""
+
+#: nova/exception.py:555
+#, python-format
+msgid "No fixed IP associated with id %(id)s."
+msgstr ""
+
+#: nova/exception.py:559
+#, python-format
+msgid "Fixed ip not found for address %(address)s."
+msgstr ""
+
+#: nova/exception.py:563
+#, python-format
+msgid "Instance %(instance_uuid)s has zero fixed ips."
+msgstr ""
+
+#: nova/exception.py:567
+#, python-format
+msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
+msgstr ""
+
+#: nova/exception.py:572
+#, python-format
+msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
+msgstr ""
+
+#: nova/exception.py:576
+#, python-format
+msgid ""
+"Fixed IP address (%(address)s) does not exist in network "
+"(%(network_uuid)s)."
+msgstr ""
+
+#: nova/exception.py:581
+#, python-format
+msgid ""
+"Fixed IP address %(address)s is already in use on instance "
+"%(instance_uuid)s."
+msgstr ""
+
+#: nova/exception.py:586
+#, python-format
+msgid "More than one instance is associated with fixed ip address '%(address)s'."
+msgstr ""
+
+#: nova/exception.py:591
+#, python-format
+msgid "Fixed IP address %(address)s is invalid."
+msgstr ""
+
+#: nova/exception.py:595
+msgid "Zero fixed ips available."
+msgstr ""
+
+#: nova/exception.py:599
+msgid "Zero fixed ips could be found."
+msgstr ""
+
+#: nova/exception.py:608
+#, python-format
+msgid "Floating ip %(address)s already exists."
+msgstr ""
+
+#: nova/exception.py:612
+#, python-format
+msgid "Floating ip not found for id %(id)s."
+msgstr ""
+
+#: nova/exception.py:616
+#, python-format
+msgid "The DNS entry %(name)s already exists in domain %(domain)s."
+msgstr ""
+
+#: nova/exception.py:620
+#, python-format
+msgid "Floating ip not found for address %(address)s."
+msgstr ""
+
+#: nova/exception.py:624
+#, python-format
+msgid "Floating ip not found for host %(host)s."
+msgstr ""
+
+#: nova/exception.py:628
+#, python-format
+msgid "Multiple floating ips are found for address %(address)s."
+msgstr ""
+
+#: nova/exception.py:632
+msgid "Floating ip pool not found."
+msgstr ""
+
+#: nova/exception.py:637
+msgid "Zero floating ips available."
+msgstr ""
+
+#: nova/exception.py:642
+#, python-format
+msgid "Floating ip %(address)s is associated."
+msgstr ""
+
+#: nova/exception.py:646
+#, python-format
+msgid "Floating ip %(address)s is not associated."
+msgstr ""
+
+#: nova/exception.py:650
+msgid "Zero floating ips exist."
+msgstr ""
+
+#: nova/exception.py:654
+#, python-format
+msgid "Interface %(interface)s not found."
+msgstr ""
+
+#: nova/exception.py:658
+msgid "Cannot disassociate auto assigined floating ip"
+msgstr ""
+
+#: nova/exception.py:662
+#, python-format
+msgid "Keypair %(name)s not found for user %(user_id)s"
+msgstr ""
+
+#: nova/exception.py:666
+#, python-format
+msgid "Certificate %(certificate_id)s not found."
+msgstr ""
+
+#: nova/exception.py:670
+#, python-format
+msgid "Service %(service_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:674
+#, python-format
+msgid "Host %(host)s could not be found."
+msgstr ""
+
+#: nova/exception.py:678
+#, python-format
+msgid "Compute host %(host)s could not be found."
+msgstr ""
+
+#: nova/exception.py:682
+#, python-format
+msgid "Could not find binary %(binary)s on host %(host)s."
+msgstr ""
+
+#: nova/exception.py:686
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
+#: nova/exception.py:690
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: nova/exception.py:695
+msgid "Quota could not be found"
+msgstr ""
+
+#: nova/exception.py:699
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: nova/exception.py:703
+#, python-format
+msgid "Quota for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:707
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:711
+#, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:715
+#, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:719
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: nova/exception.py:723
+#, python-format
+msgid "Security group %(security_group_id)s not found."
+msgstr ""
+
+#: nova/exception.py:727
+#, python-format
+msgid "Security group %(security_group_id)s not found for project %(project_id)s."
+msgstr ""
+
+#: nova/exception.py:732
+#, python-format
+msgid "Security group with rule %(rule_id)s not found."
+msgstr ""
+
+#: nova/exception.py:736
+#, python-format
+msgid ""
+"Security group %(security_group_id)s is already associated with the "
+"instance %(instance_id)s"
+msgstr ""
+
+#: nova/exception.py:741
+#, python-format
+msgid ""
+"Security group %(security_group_id)s is not associated with the instance "
+"%(instance_id)s"
+msgstr ""
+
+#: nova/exception.py:746
+#, python-format
+msgid "Security group default rule (%rule_id)s not found."
+msgstr ""
+
+#: nova/exception.py:750
+msgid ""
+"Network requires port_security_enabled and subnet associated in order to "
+"apply security groups."
+msgstr ""
+
+#: nova/exception.py:755
+msgid "No Unique Match Found."
+msgstr ""
+
+#: nova/exception.py:760
+#, python-format
+msgid "Migration %(migration_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:764
+#, python-format
+msgid "Migration not found for instance %(instance_id)s with status %(status)s."
+msgstr ""
+
+#: nova/exception.py:769
+#, python-format
+msgid "Console pool %(pool_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:773
+#, python-format
+msgid ""
+"Console pool of type %(console_type)s for compute host %(compute_host)s "
+"on proxy host %(host)s not found."
+msgstr ""
+
+#: nova/exception.py:779
+#, python-format
+msgid "Console %(console_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:783
+#, python-format
+msgid "Console for instance %(instance_uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:787
+#, python-format
+msgid ""
+"Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
+"found."
+msgstr ""
+
+#: nova/exception.py:792
+#, python-format
+msgid "Invalid console type %(console_type)s"
+msgstr ""
+
+#: nova/exception.py:796
+#, python-format
+msgid "Instance type %(instance_type_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:800
+#, python-format
+msgid "Instance type with name %(instance_type_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:805
+#, python-format
+msgid "Flavor %(flavor_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:809
+#, python-format
+msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
+msgstr ""
+
+#: nova/exception.py:814
+#, python-format
+msgid "Cell %(cell_name)s doesn't exist."
+msgstr ""
+
+#: nova/exception.py:818
+#, python-format
+msgid "Inconsistency in cell routing: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:822
+#, python-format
+msgid "Service API method not found: %(detail)s"
+msgstr ""
+
+#: nova/exception.py:826
+msgid "Timeout waiting for response from cell"
+msgstr ""
+
+#: nova/exception.py:830
+#, python-format
+msgid "Cell message has reached maximum hop count: %(hop_count)s"
+msgstr ""
+
+#: nova/exception.py:834
+msgid "No cells available matching scheduling criteria."
+msgstr ""
+
+#: nova/exception.py:838
+#, python-format
+msgid "Exception received during cell processing: %(exc_name)s."
+msgstr ""
+
+#: nova/exception.py:842
+#, python-format
+msgid "Cell is not known for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/exception.py:846
+#, python-format
+msgid "Scheduler Host Filter %(filter_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:850
+#, python-format
+msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:855
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:860
+#, python-format
+msgid ""
+"Instance Type %(instance_type_id)s has no extra specs with key "
+"%(extra_specs_key)s."
+msgstr ""
+
+#: nova/exception.py:865
+#, python-format
+msgid "File %(file_path)s could not be found."
+msgstr ""
+
+#: nova/exception.py:869
+msgid "Zero files could be found."
+msgstr ""
+
+#: nova/exception.py:873
+#, python-format
+msgid "Virtual switch associated with the network adapter %(adapter)s not found."
+msgstr ""
+
+#: nova/exception.py:878
+#, python-format
+msgid "Network adapter %(adapter)s could not be found."
+msgstr ""
+
+#: nova/exception.py:882
+#, python-format
+msgid "Class %(class_name)s could not be found: %(exception)s"
+msgstr ""
+
+#: nova/exception.py:886
+msgid "Action not allowed."
+msgstr ""
+
+#: nova/exception.py:890
+msgid "Rotation is not allowed for snapshots"
+msgstr ""
+
+#: nova/exception.py:894
+msgid "Rotation param is required for backup image_type"
+msgstr ""
+
+#: nova/exception.py:898
+#, python-format
+msgid "Key pair %(key_name)s already exists."
+msgstr ""
+
+#: nova/exception.py:902
+#, python-format
+msgid "Instance %(name)s already exists."
+msgstr ""
+
+#: nova/exception.py:906
+#, python-format
+msgid "Instance Type with name %(name)s already exists."
+msgstr ""
+
+#: nova/exception.py:910
+#, python-format
+msgid "Instance Type with ID %(flavor_id)s already exists."
+msgstr ""
+
+#: nova/exception.py:914
+#, python-format
+msgid ""
+"Flavor access alreay exists for flavor %(flavor_id)s and project "
+"%(project_id)s combination."
+msgstr ""
+
+#: nova/exception.py:919
+#, python-format
+msgid "%(path)s is not on shared storage: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:923
+#, python-format
+msgid "%(path)s is not on local storage: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:927
+msgid "Migration error"
+msgstr ""
+
+#: nova/exception.py:931
+msgid "Migration pre-check error"
+msgstr ""
+
+#: nova/exception.py:935
+#, python-format
+msgid "Malformed message body: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:941
+#, python-format
+msgid "Could not find config at %(path)s"
+msgstr ""
+
+#: nova/exception.py:945
+#, python-format
+msgid "Could not load paste app '%(name)s' from %(path)s"
+msgstr ""
+
+#: nova/exception.py:949
+msgid "When resizing, instances must change flavor!"
+msgstr ""
+
+#: nova/exception.py:953
+#, python-format
+msgid "Resize error: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:957
+msgid "Image is larger than instance type allows"
+msgstr ""
+
+#: nova/exception.py:961
+msgid "Instance type's memory is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:965
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:969
+#, python-format
+msgid "Insufficient free memory on compute node to start %(uuid)s."
+msgstr ""
+
+#: nova/exception.py:973
+msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
+msgstr ""
+
+#: nova/exception.py:977
+#, python-format
+msgid "No valid host was found. %(reason)s"
+msgstr ""
+
+#: nova/exception.py:981
+msgid "Quota exceeded"
+msgstr ""
+
+#: nova/exception.py:988
+#, python-format
+msgid ""
+"Quota exceeded for %(overs)s: Requested %(req)s, but already used "
+"%(used)d of %(allowed)d %(resource)s"
+msgstr ""
+
+#: nova/exception.py:993
+msgid "Maximum number of floating ips exceeded"
+msgstr ""
+
+#: nova/exception.py:997
+msgid "Maximum number of fixed ips exceeded"
+msgstr ""
+
+#: nova/exception.py:1001
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:1005
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:1009
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:1013
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:1017
+msgid "Maximum number of key pairs exceeded"
+msgstr ""
+
+#: nova/exception.py:1021
+msgid "Maximum number of security groups or rules exceeded"
+msgstr ""
+
+#: nova/exception.py:1025
+#, python-format
+msgid ""
+"Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
+"%(reason)s."
+msgstr ""
+
+#: nova/exception.py:1030
+#, python-format
+msgid "Aggregate %(aggregate_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1034
+#, python-format
+msgid "Aggregate %(aggregate_name)s already exists."
+msgstr ""
+
+#: nova/exception.py:1038
+#, python-format
+msgid "Aggregate %(aggregate_id)s has no host %(host)s."
+msgstr ""
+
+#: nova/exception.py:1042
+#, python-format
+msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:1047
+#, python-format
+msgid "Aggregate %(aggregate_id)s already has host %(host)s."
+msgstr ""
+
+#: nova/exception.py:1051
+msgid "Unable to create instance type"
+msgstr ""
+
+#: nova/exception.py:1055
+#, python-format
+msgid "Failed to set admin password on %(instance)s because %(reason)s"
+msgstr ""
+
+#: nova/exception.py:1061
+#, python-format
+msgid "Detected existing vlan with id %(vlan)d"
+msgstr ""
+
+#: nova/exception.py:1065
+msgid "There was a conflict when trying to complete your request."
+msgstr ""
+
+#: nova/exception.py:1070
+#, python-format
+msgid "Instance %(instance_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1074
+#, python-format
+msgid "Info cache for instance %(instance_uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1079
+#, python-format
+msgid "Node %(node_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1083
+#, python-format
+msgid "Node with UUID %(node_uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1087
+#, python-format
+msgid "Marker %(marker)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1091
+#, python-format
+msgid "Invalid id: %(val)s (expecting \"i-...\")."
+msgstr ""
+
+#: nova/exception.py:1095
+#, python-format
+msgid "Could not fetch image %(image_id)s"
+msgstr ""
+
+#: nova/exception.py:1099
+#, python-format
+msgid "Could not upload image %(image_id)s"
+msgstr ""
+
+#: nova/exception.py:1103
+#, python-format
+msgid "Task %(task_name)s is already running on host %(host)s"
+msgstr ""
+
+#: nova/exception.py:1107
+#, python-format
+msgid "Task %(task_name)s is not running on host %(host)s"
+msgstr ""
+
+#: nova/exception.py:1111
+#, python-format
+msgid "Instance %(instance_uuid)s is locked"
+msgstr ""
+
+#: nova/exception.py:1115
+#, python-format
+msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
+msgstr ""
+
+#: nova/exception.py:1120
+#, python-format
+msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
+msgstr ""
+
+#: nova/exception.py:1125
+#, python-format
+msgid "Failed to attach network adapter device to %(instance)s"
+msgstr ""
+
+#: nova/exception.py:1129
+#, python-format
+msgid "Failed to detach network adapter device from  %(instance)s"
+msgstr ""
+
+#: nova/exception.py:1133
+#, python-format
+msgid ""
+"User data too large. User data must be no larger than %(maxsize)s bytes "
+"once base64 encoded. Your data is %(length)d bytes"
+msgstr ""
+
+#: nova/exception.py:1139
+msgid "User data needs to be valid base 64."
+msgstr ""
+
+#: nova/exception.py:1143
+#, python-format
+msgid ""
+"unexpected task state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1148
+#, python-format
+msgid ""
+"Action for request_id %(request_id)s on instance %(instance_uuid)s not "
+"found"
+msgstr ""
+
+#: nova/exception.py:1153
+#, python-format
+msgid "Event %(event)s not found for action id %(action_id)s"
+msgstr ""
+
+#: nova/exception.py:1157
+#, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
+msgid "The CA file for %(project)s could not be found"
+msgstr ""
+
+#: nova/exception.py:1166
+#, python-format
+msgid "The CRL file for %(project)s could not be found"
+msgstr ""
+
+#: nova/exception.py:1170
+msgid "Instance recreate is not implemented by this virt driver."
+msgstr ""
+
+#: nova/exception.py:1174
+#, python-format
+msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
+msgstr ""
+
+#: nova/exception.py:1179
+#, python-format
+msgid "%(binary)s attempted direct database access which is not allowed by policy"
+msgstr ""
+
+#: nova/exception.py:1184
+#, python-format
+msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
+msgstr ""
+
+#: nova/exception.py:1189
+#, python-format
+msgid ""
+"Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
+"driver"
+msgstr ""
+
+#: nova/exception.py:1194
+#, python-format
+msgid "Invalid Base 64 data for file %(path)s"
+msgstr ""
+
+#: nova/exception.py:1198
+#, python-format
+msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:1202
+#, python-format
+msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
+#: nova/hooks.py:62
+#, python-format
+msgid "Running %(name)s pre-hook: %(obj)s"
+msgstr ""
+
+#: nova/hooks.py:70
+#, python-format
+msgid "Running %(name)s post-hook: %(obj)s"
+msgstr ""
+
+#: nova/manager.py:170
+msgid "Notifying Schedulers of capabilities ..."
+msgstr ""
+
+#: nova/notifications.py:112 nova/notifications.py:152
+msgid "Failed to send state update notification"
+msgstr ""
+
+#: nova/notifications.py:232
+msgid "Failed to get nw_info"
+msgstr ""
+
+#: nova/policy.py:32
+msgid "JSON file representing policy"
+msgstr ""
+
+#: nova/policy.py:35
+msgid "Rule checked when requested rule is not found"
+msgstr ""
+
+#: nova/quota.py:972
+#, python-format
+msgid "Created reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:994
+#, python-format
+msgid "Failed to commit reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:996
+#, python-format
+msgid "Committed reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:1016
+#, python-format
+msgid "Failed to roll back reservations %(reservations)s"
+msgstr ""
+
+#: nova/quota.py:1018
+#, python-format
+msgid "Rolled back reservations %(reservations)s"
+msgstr ""
+
+#: nova/service.py:153
+#, python-format
+msgid "Starting %(topic)s node (version %(version)s)"
+msgstr ""
+
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
+#, python-format
+msgid "Creating Consumer connection for Service %s"
+msgstr ""
+
+#: nova/service.py:190
+#, python-format
+msgid "Join ServiceGroup membership for this service %s"
+msgstr ""
+
+#: nova/service.py:270
+msgid "Service killed that has no database entry"
+msgstr ""
+
+#: nova/service.py:292
+#, python-format
+msgid "Temporary directory is invalid: %s"
+msgstr ""
+
+#: nova/service.py:394
+msgid "serve() can only be called once"
+msgstr ""
+
+#: nova/utils.py:145
+#, python-format
+msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
+msgstr ""
+
+#: nova/utils.py:173
+#, python-format
+msgid "debug in callback: %s"
+msgstr ""
+
+#: nova/utils.py:335
+#, python-format
+msgid "Link Local address is not found.:%s"
+msgstr ""
+
+#: nova/utils.py:338
+#, python-format
+msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgstr ""
+
+#: nova/utils.py:377
+#, python-format
+msgid "Invalid backend: %s"
+msgstr ""
+
+#: nova/utils.py:438
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
+#: nova/utils.py:567
+#, python-format
+msgid "Expected object of type: %s"
+msgstr ""
+
+#: nova/utils.py:596
+#, python-format
+msgid "Invalid server_string: %s"
+msgstr ""
+
+#: nova/utils.py:733
+#, python-format
+msgid "timefunc: '%(name)s' took %(total_time).2f secs"
+msgstr ""
+
+#: nova/utils.py:799
+#, python-format
+msgid "Reloading cached file %s"
+msgstr ""
+
+#: nova/utils.py:931 nova/virt/configdrive.py:177
+#, python-format
+msgid "Could not remove tmpdir: %s"
+msgstr ""
+
+#: nova/utils.py:1083
+#, python-format
+msgid "%s is not a string or unicode"
+msgstr ""
+
+#: nova/utils.py:1087
+#, python-format
+msgid "%(name)s has less than %(min_length)s characters."
+msgstr ""
+
+#: nova/utils.py:1092
+#, python-format
+msgid "%(name)s has more than %(max_length)s characters."
+msgstr ""
+
+#: nova/wsgi.py:122
+#, python-format
+msgid "%(name)s listening on %(host)s:%(port)s"
+msgstr ""
+
+#: nova/wsgi.py:137
+#, python-format
+msgid "Unable to find cert_file : %s"
+msgstr ""
+
+#: nova/wsgi.py:141
+#, python-format
+msgid "Unable to find ca_file : %s"
+msgstr ""
+
+#: nova/wsgi.py:145
+#, python-format
+msgid "Unable to find key_file : %s"
+msgstr ""
+
+#: nova/wsgi.py:149
+msgid ""
+"When running server in SSL mode, you must specify both a cert_file and "
+"key_file option value in your configuration file"
+msgstr ""
+
+#: nova/wsgi.py:180
+#, python-format
+msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
+msgstr ""
+
+#: nova/wsgi.py:207
+msgid "Stopping WSGI server."
+msgstr ""
+
+#: nova/wsgi.py:225
+msgid "WSGI server has stopped."
+msgstr ""
+
+#: nova/wsgi.py:294
+msgid "You must implement __call__"
+msgstr ""
+
+#: nova/wsgi.py:480
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
+#: nova/api/auth.py:116
+msgid "Invalid service catalog json."
+msgstr ""
+
+#: nova/api/auth.py:139
+msgid "Sourcing roles from deprecated X-Role HTTP header"
+msgstr ""
+
+#: nova/api/sizelimit.py:53 nova/api/sizelimit.py:62 nova/api/sizelimit.py:76
+#: nova/api/metadata/password.py:62
+msgid "Request is too large."
+msgstr ""
+
+#: nova/api/validator.py:131
+#, python-format
+msgid "%(key)s with value %(value)s failed validator %(name)s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:81
+#, python-format
+msgid "%(code)s: %(message)s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:104
+#, python-format
+msgid "FaultWrapper: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:174
+msgid "Too many failed authentications."
+msgstr ""
+
+#: nova/api/ec2/__init__.py:183
+#, python-format
+msgid ""
+"Access key %(access_key)s has had %(failures)d failed authentications and"
+" will be locked out for %(lock_mins)d minutes."
+msgstr ""
+
+#: nova/api/ec2/__init__.py:202
+msgid "Signature not provided"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:206
+msgid "Access key not provided"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+msgid "Failure communicating with keystone"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:255
+#, python-format
+msgid "Keystone failure: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:315
+msgid "Timestamp failed validation."
+msgstr ""
+
+#: nova/api/ec2/__init__.py:335
+#, python-format
+msgid "action: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:337
+#, python-format
+msgid "arg: %(key)s\t\tval: %(value)s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:413
+#, python-format
+msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:487
+#, python-format
+msgid "InstanceNotFound raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:493
+#, python-format
+msgid "VolumeNotFound raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:499
+#, python-format
+msgid "SnapshotNotFound raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:505
+#, python-format
+msgid "NotFound raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:514
+#, python-format
+msgid "KeyPairExists raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:519
+#, python-format
+msgid "InvalidKeypair raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:524
+#, python-format
+msgid "InvalidParameterValue raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:528
+#, python-format
+msgid "InvalidPortRange raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:532
+#, python-format
+msgid "NotAuthorized raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:536
+#, python-format
+msgid "InvalidRequest raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:540
+#, python-format
+msgid "QuotaError raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:544
+#, python-format
+msgid "Invalid id: bogus (expecting \"i-...\"): %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:553
+#, python-format
+msgid "Unexpected error raised: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:554
+#, python-format
+msgid "Environment: %s"
+msgstr ""
+
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
+msgid "An unknown error has occurred. Please try your request again."
+msgstr ""
+
+#: nova/api/ec2/apirequest.py:61
+#, python-format
+msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:391
+#, python-format
+msgid "Create snapshot of volume %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:416
+#, python-format
+msgid "Could not find key pair(s): %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:433
+#, python-format
+msgid "Create key pair %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/openstack/compute/contrib/keypairs.py:93
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:449
+#, python-format
+msgid "Import key %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:469
+#, python-format
+msgid "Delete key pair %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:616
+#, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:623
+#, python-format
+msgid "Invalid IP protocol %s."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+msgid "No rule for the specified parameters."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:676
+#, python-format
+msgid "%s - This rule already exists in group"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:759
+#, python-format
+msgid "Get console output for instance %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:832
+#, python-format
+msgid "Create volume from snapshot %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#, python-format
+msgid "Create volume of %s GB"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:863
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:876
+#, python-format
+msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:887
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#, python-format
+msgid "Detach volume %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:916
+msgid "Detach Volume Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
+#, python-format
+msgid "attribute not supported: %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1073
+#, python-format
+msgid "vol = %s\n"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1233
+msgid "Allocate address"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1237
+msgid "No more floating IPs available"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1241
+#, python-format
+msgid "Release address %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1246
+msgid "Unable to release IP Address."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1249
+#, python-format
+msgid "Associate address %(public_ip)s to instance %(instance_id)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1259
+msgid "Unable to associate IP Address, no fixed_ips."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1267
+#: nova/api/openstack/compute/contrib/floating_ips.py:248
+#, python-format
+msgid "multiple fixed_ips exist, using the first: %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1276
+msgid "Floating ip is already associated."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1279
+msgid "l3driver call to add floating ip failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1282
+msgid "Error, unable to associate floating ip."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1290
+#, python-format
+msgid "Disassociate address %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1295
+msgid "Floating ip is not associated."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1298
+#: nova/api/openstack/compute/contrib/floating_ips.py:97
+msgid "Cannot disassociate auto assigned floating ip"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1325
+msgid "Image must be available"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1357
+msgid "Going to start terminating instances"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1367
+#, python-format
+msgid "Reboot instance %r"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1376
+msgid "Going to stop instances"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1385
+msgid "Going to start instances"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1476
+#, python-format
+msgid "De-registering image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1492
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1511
+#, python-format
+msgid "Registered image %(image_location)s with id %(image_id)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1574
+msgid "user or group not specified"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1576
+msgid "only group \"all\" is supported"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1578
+msgid "operation_type must be add or remove"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1580
+#, python-format
+msgid "Updating image %s publicity"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1593
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1621
+#, python-format
+msgid ""
+"Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
+"have a volume attached at root (%(root)s)"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1652
+#, python-format
+msgid "Couldn't stop instance with in %d sec"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1670
+#, python-format
+msgid "image of %(instance)s at %(now)s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+msgid "resource_id and tag are required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
+msgid "Expecting a list of resources"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+msgid "Only instances implemented"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
+msgid "Expecting a list of tagSets"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1761
+msgid "Expecting key to be set"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1834
+msgid "Invalid CIDR"
+msgstr ""
+
+#: nova/api/ec2/ec2utils.py:249
+msgid "Request must include either Timestamp or Expires, but cannot contain both"
+msgstr ""
+
+#: nova/api/ec2/ec2utils.py:267
+msgid "Timestamp is invalid."
+msgstr ""
+
+#: nova/api/metadata/handler.py:108
+msgid ""
+"X-Instance-ID present in request headers. The "
+"'service_quantum_metadata_proxy' option must be enabled to process this "
+"header."
+msgstr ""
+
+#: nova/api/metadata/handler.py:134 nova/api/metadata/handler.py:141
+#, python-format
+msgid "Failed to get metadata for ip: %s"
+msgstr ""
+
+#: nova/api/metadata/handler.py:153
+msgid "X-Instance-ID header is missing from request."
+msgstr ""
+
+#: nova/api/metadata/handler.py:155
+msgid "Multiple X-Instance-ID headers found within request."
+msgstr ""
+
+#: nova/api/metadata/handler.py:169
+#, python-format
+msgid ""
+"X-Instance-ID-Signature: %(signature)s does not match the expected value:"
+" %(expected_signature)s for id: %(instance_id)s.  Request From: "
+"%(remote_address)s"
+msgstr ""
+
+#: nova/api/metadata/handler.py:178
+msgid "Invalid proxy request signature."
+msgstr ""
+
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
+#, python-format
+msgid "Failed to get metadata for instance id: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:53
+#, python-format
+msgid "Caught error: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:62
+#, python-format
+msgid "%(url)s returned with HTTP %(status)d"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:137
+msgid "Must specify an ExtensionManager class"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
+#, python-format
+msgid "Extended resource: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
+#, python-format
+msgid ""
+"Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
+"resource"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
+#, python-format
+msgid "Extension %(ext_name)s extending resource: %(collection)s"
+msgstr ""
+
+#: nova/api/openstack/common.py:114
+#, python-format
+msgid ""
+"status is UNKNOWN from vm_state=%(vm_state)s task_state=%(task_state)s. "
+"Bad upgrade or db corrupted?"
+msgstr ""
+
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
+msgid "limit param must be an integer"
+msgstr ""
+
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
+msgid "limit param must be positive"
+msgstr ""
+
+#: nova/api/openstack/common.py:182
+msgid "offset param must be an integer"
+msgstr ""
+
+#: nova/api/openstack/common.py:196
+msgid "offset param must be positive"
+msgstr ""
+
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
+#, python-format
+msgid "marker [%s] not found"
+msgstr ""
+
+#: nova/api/openstack/common.py:271
+#, python-format
+msgid "href %s does not contain version"
+msgstr ""
+
+#: nova/api/openstack/common.py:286
+msgid "Image metadata limit exceeded"
+msgstr ""
+
+#: nova/api/openstack/common.py:294
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:297
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:300
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:362
+#, python-format
+msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
+msgstr ""
+
+#: nova/api/openstack/common.py:366
+#, python-format
+msgid "Instance is in an invalid state for '%s'"
+msgstr ""
+
+#: nova/api/openstack/common.py:446
+msgid "Rejecting snapshot request, snapshots currently disabled"
+msgstr ""
+
+#: nova/api/openstack/common.py:448
+msgid "Instance snapshots are not permitted at this time."
+msgstr ""
+
+#: nova/api/openstack/extensions.py:196
+#, python-format
+msgid "Loaded extension: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:235
+#, python-format
+msgid "Ext name: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:236
+#, python-format
+msgid "Ext alias: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:237
+#, python-format
+msgid "Ext description: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:239
+#, python-format
+msgid "Ext namespace: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:240
+#, python-format
+msgid "Ext updated: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:242
+#, python-format
+msgid "Exception loading extension: %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:256
+#, python-format
+msgid "Loading extension %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:265
+#, python-format
+msgid "Calling extension factory %s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:277
+#, python-format
+msgid "Failed to load extension %(ext_factory)s: %(exc)s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:347
+#, python-format
+msgid "Failed to load extension %(classpath)s: %(exc)s"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:370
+#, python-format
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
+msgid "cannot understand JSON"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:631
+msgid "too many body keys"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:675
+#, python-format
+msgid "Exception handling resource: %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:679
+#, python-format
+msgid "Fault thrown: %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:682
+#, python-format
+msgid "HTTP exception thrown: %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:796
+msgid "Unrecognized Content-Type provided in request"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:800
+msgid "No Content-Type provided in request"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:804
+msgid "Empty body provided in request"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:912
+#, python-format
+msgid "There is no such action: %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
+#: nova/api/openstack/compute/server_metadata.py:58
+#: nova/api/openstack/compute/server_metadata.py:76
+#: nova/api/openstack/compute/server_metadata.py:101
+#: nova/api/openstack/compute/server_metadata.py:126
+#: nova/api/openstack/compute/contrib/admin_actions.py:211
+#: nova/api/openstack/compute/contrib/evacuate.py:47
+msgid "Malformed request body"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:919
+#, python-format
+msgid "Action: '%(action)s', body: %(body)s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:922
+#, python-format
+msgid "Calling method %s"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:931
+msgid "Unsupported Content-Type"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:943
+msgid "Malformed request url"
+msgstr ""
+
+#: nova/api/openstack/wsgi.py:1174
+#, python-format
+msgid "Returning %(code)s to user: %(explanation)s"
+msgstr ""
+
+#: nova/api/openstack/xmlutil.py:270
+msgid "element is not a child"
+msgstr ""
+
+#: nova/api/openstack/xmlutil.py:419
+msgid "root element selecting a list"
+msgstr ""
+
+#: nova/api/openstack/xmlutil.py:742
+#, python-format
+msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
+msgstr ""
+
+#: nova/api/openstack/xmlutil.py:862
+msgid "subclasses must implement construct()!"
+msgstr ""
+
+#: nova/api/openstack/compute/extensions.py:39
+msgid "Initializing extension manager."
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:107
+#, python-format
+msgid "Invalid is_public filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:127
+#, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:134
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:36
+#: nova/api/openstack/compute/images.py:141
+#: nova/api/openstack/compute/images.py:157
+msgid "Image not found."
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:76
+msgid "Incorrect request body format"
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:80
+#: nova/api/openstack/compute/server_metadata.py:80
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:85
+msgid "Request body and URI mismatch"
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/server_metadata.py:84
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:88
+msgid "Request body contains too many items"
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:109
+msgid "Invalid metadata key"
+msgstr ""
+
+#: nova/api/openstack/compute/images.py:162
+msgid "You are not allowed to delete the image."
+msgstr ""
+
+#: nova/api/openstack/compute/ips.py:68
+msgid "Instance does not exist"
+msgstr ""
+
+#: nova/api/openstack/compute/ips.py:91
+msgid "Instance is not a member of specified network"
+msgstr ""
+
+#: nova/api/openstack/compute/limits.py:161
+#, python-format
+msgid ""
+"Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
+"%(unit_string)s."
+msgstr ""
+
+#: nova/api/openstack/compute/limits.py:288
+msgid "This request was rate-limited."
+msgstr ""
+
+#: nova/api/openstack/compute/server_metadata.py:38
+#: nova/api/openstack/compute/server_metadata.py:122
+#: nova/api/openstack/compute/server_metadata.py:173
+msgid "Server does not exist"
+msgstr ""
+
+#: nova/api/openstack/compute/server_metadata.py:154
+#: nova/api/openstack/compute/server_metadata.py:165
+msgid "Metadata item was not found"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:521
+#: nova/api/openstack/compute/contrib/cells.py:272
+msgid "Invalid changes-since value"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:540
+msgid "Only administrators may list deleted instances"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:559
+#, python-format
+msgid "Flavor '%s' could not be found "
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
+msgid "Instance could not be found"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:595
+msgid "Device name cannot include spaces."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:612
+#, python-format
+msgid "Bad personality format: missing %s"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:615
+msgid "Bad personality format"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:618
+#, python-format
+msgid "Personality content for %s cannot be decoded"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:649
+msgid "Unknown argment : port"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:652
+#, python-format
+msgid "Bad port format: port uuid is not in proper format (%s)"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:662
+#, python-format
+msgid "Bad networks format: network uuid is not in proper format (%s)"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:672
+#, python-format
+msgid "Invalid fixed IP address (%s)"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:685
+#, python-format
+msgid "Duplicate networks (%s) are not allowed"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:691
+#, python-format
+msgid "Bad network format: missing %s"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:694
+msgid "Bad networks format"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:720
+msgid "Userdata content cannot be decoded"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:725
+msgid "accessIPv4 is not proper IPv4 format"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:730
+msgid "accessIPv6 is not proper IPv6 format"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:759
+msgid "Server name is not defined"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
+msgid "Invalid flavorRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:849
+msgid "min_count must be an integer value"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:852
+msgid "min_count must be > 0"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:858
+msgid "max_count must be an integer value"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:861
+msgid "max_count must be > 0"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:865
+msgid "min_count must be <= max_count"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:919
+msgid "Can not find requested image"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:927
+msgid "Invalid key_name provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1001
+msgid "HostId cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1005
+msgid "Personality cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
+msgid "Instance has not been resized."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1051
+msgid "Flavor used by the instance could not be found."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1067
+msgid "Argument 'type' for reboot is not HARD or SOFT"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1071
+msgid "Missing argument 'type' for reboot"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1093
+msgid "Unable to locate requested flavor."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1096
+msgid "Resize requires a flavor change."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1120
+msgid "Missing imageRef attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1129
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1156
+msgid "Missing flavorRef attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1169
+msgid "No adminPass was specified"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1173
+#: nova/api/openstack/compute/servers.py:1382
+msgid "Invalid adminPass"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1179
+msgid "Unable to set password on instance"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1188
+msgid "Unable to parse metadata key/value pairs."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1201
+msgid "Resize request has invalid 'flavorRef' attribute."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1204
+msgid "Resize requests require 'flavorRef' attribute."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1222
+#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/keypairs.py:78
+msgid "Invalid request body"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1228
+msgid "Could not parse imageRef from request."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1289
+msgid "Cannot find image for rebuild"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1323
+msgid "createImage entity requires name attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1408
+#, python-format
+msgid "Removing options '%s' from query"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:60
+#, python-format
+msgid "Compute.api::pause %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:77
+#, python-format
+msgid "Compute.api::unpause %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:94
+#, python-format
+msgid "compute.api::suspend %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:111
+#, python-format
+msgid "compute.api::resume %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:127
+#, python-format
+msgid "Error in migrate %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:141
+#, python-format
+msgid "Compute.api::reset_network %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:154
+#: nova/api/openstack/compute/contrib/admin_actions.py:170
+#: nova/api/openstack/compute/contrib/admin_actions.py:186
+#: nova/api/openstack/compute/contrib/admin_actions.py:321
+#: nova/api/openstack/compute/contrib/multinic.py:41
+#: nova/api/openstack/compute/contrib/rescue.py:42
+msgid "Server not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:157
+#, python-format
+msgid "Compute.api::inject_network_info %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:173
+#, python-format
+msgid "Compute.api::lock %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:189
+#, python-format
+msgid "Compute.api::unlock %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:219
+#, python-format
+msgid "createBackup entity requires %s attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:223
+msgid "Malformed createBackup entity"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:229
+msgid "createBackup attribute 'rotation' must be an integer"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:232
+msgid "createBackup attribute 'rotation' must be greater than or equal to zero"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:248
+#: nova/api/openstack/compute/contrib/console_output.py:45
+#: nova/api/openstack/compute/contrib/server_diagnostics.py:47
+#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+msgid "Instance not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:278
+msgid "host and block_migration must be specified."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:292
+#, python-format
+msgid "Live migration of instance %s to another host failed"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:295
+#, python-format
+msgid "Live migration of instance %(id)s to host %(host)s failed"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:313
+#, python-format
+msgid "Desired state must be specified.  Valid states are: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:324
+#, python-format
+msgid "Compute.api::resetState %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:89
+#, python-format
+msgid "Cannot show aggregate: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:115
+#, python-format
+msgid "Cannot update aggregate: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:127
+#, python-format
+msgid "Cannot delete aggregate: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:140
+#, python-format
+msgid "Aggregates does not have %s action"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:153
+#: nova/api/openstack/compute/contrib/aggregates.py:158
+#, python-format
+msgid "Cannot add host %(host)s in aggregate %(id)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:172
+#: nova/api/openstack/compute/contrib/aggregates.py:176
+#, python-format
+msgid "Cannot remove host %(host)s in aggregate %(id)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/aggregates.py:196
+#, python-format
+msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:102
+msgid "Attach interface"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:109
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:142
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:165
+msgid "Network driver does not support this function."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:113
+msgid "Failed to attach interface"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:121
+msgid "Attachments update is not supported"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/attach_interfaces.py:132
+#, python-format
+msgid "Detach interface %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/baremetal_nodes.py:192
+msgid "Must specify id or address"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:193
+msgid "Cell name cannot be empty"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:197
+msgid "Cell name cannot contain '!' or '.'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:204
+msgid "Cell type must be 'parent' or 'child'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:224
+#: nova/api/openstack/compute/contrib/cells.py:244
+msgid "No cell information in request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:229
+msgid "No cell name in request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cells.py:266
+msgid "Only 'updated_since' and 'project_id' are understood."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/certificates.py:71
+msgid "Only root certificate can be retrieved."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cloudpipe.py:149
+msgid ""
+"Unable to claim IP for VPN instances, ensure it isn't running, and try "
+"again in a few minutes"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/cloudpipe_update.py:41
+#, python-format
+msgid "Unknown action %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/console_output.py:50
+msgid "os-getConsoleOutput malformed or missing from request body"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/console_output.py:57
+msgid "Length in request body must be an integer value"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/console_output.py:65
+msgid "Unable to get console"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/consoles.py:51
+msgid "Instance not yet ready"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:97
+#, python-format
+msgid "Can't connect to service: %s, no portspecified\n"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:116
+msgid "Coverage begin"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+msgid "Coverage not running"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+msgid "Invalid path"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+msgid "No path given for report file"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+msgid "You can't use html reports without combining"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#, python-format
+msgid "Directory conflict: %s already exists"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+msgid "Python coverage module is not installed."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#, python-format
+msgid "Coverage doesn't have %s action"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/disk_config.py:43
+#, python-format
+msgid "%s must be either 'MANUAL' or 'AUTO'."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/evacuate.py:59
+msgid "admin password can't be changed on existing disk"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/evacuate.py:67
+msgid "host and onSharedStorage must be specified."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/evacuate.py:78
+#, python-format
+msgid "Error in evacuate, %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/fixed_ips.py:39
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:41
+#, python-format
+msgid "Fixed IP %s has been deleted"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/fixed_ips.py:71
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:75
+#, python-format
+msgid "Fixed IP %s not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/flavor_access.py:76
+#: nova/api/openstack/compute/contrib/flavor_access.py:100
+msgid "Flavor not found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/flavor_access.py:105
+msgid "Access list not available for public flavors."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/flavor_access.py:117
+msgid "No request body"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:55
+msgid "No Request Body"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ip_dns.py:223
+msgid "DNS entries not found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:129
+#: nova/api/openstack/compute/contrib/floating_ips.py:177
+#, python-format
+msgid "Floating ip not found for id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:162
+#, python-format
+msgid "No more floating ips in pool %s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:164
+msgid "No more floating ips available."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:189
+#, python-format
+msgid "Floating ip %s has been disassociated"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:216
+#: nova/api/openstack/compute/contrib/floating_ips.py:281
+#: nova/api/openstack/compute/contrib/security_groups.py:413
+msgid "Missing parameter dict"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:219
+#: nova/api/openstack/compute/contrib/floating_ips.py:284
+msgid "Address not specified"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:226
+msgid "No nw_info cache associated with instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:231
+msgid "No fixed ips associated to instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:242
+msgid "Specified fixed address not assigned to instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:256
+msgid "floating ip is already associated"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:259
+msgid "l3driver call to add floating ip failed"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:263
+#: nova/api/openstack/compute/contrib/floating_ips.py:292
+msgid "floating ip not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:266
+msgid "Error. Unable to associate floating ip"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:307
+msgid "Floating ip is not associated"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:311
+#, python-format
+msgid "Floating ip %(address)s is not associated with instance %(id)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
+#: nova/cmd/manage.py:377
+#, python-format
+msgid "/%s should be specified as single address(es) not in cidr format"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/fping.py:53
+msgid "fping utility is not found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:183
+#, python-format
+msgid "Invalid update setting: '%s'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:186
+#, python-format
+msgid "Invalid status: '%s'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:188
+#, python-format
+msgid "Invalid mode: '%s'"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:190
+msgid "'status' or 'maintenance_mode' needed for host update"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:205
+#, python-format
+msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:211
+msgid "Virt driver does not implement host maintenance mode."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:224
+#, python-format
+msgid "Enabling host %s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:226
+#, python-format
+msgid "Disabling host %s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:231
+msgid "Virt driver does not implement host disabled status."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:247
+msgid "Virt driver does not implement host power management."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hosts.py:333
+msgid "Describe-resource is admin only functionality"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hypervisors.py:183
+#: nova/api/openstack/compute/contrib/hypervisors.py:194
+#, python-format
+msgid "Hypervisor with ID '%s' could not be found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hypervisors.py:202
+msgid "Virt driver does not implement uptime function."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/hypervisors.py:218
+#: nova/api/openstack/compute/contrib/hypervisors.py:228
+#, python-format
+msgid "No hypervisor matching '%s' could be found."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/instance_usage_audit_log.py:57
+#, python-format
+msgid "Invalid timestamp for date %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/keypairs.py:101
+#, python-format
+msgid "Key pair '%s' already exists."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/multinic.py:52
+msgid "Missing 'networkId' argument for addFixedIp"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/multinic.py:68
+msgid "Missing 'address' argument for removeFixedIp"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/multinic.py:77
+#, python-format
+msgid "Unable to find address %r"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/networks_associate.py:23
+#, python-format
+msgid "Disassociating host with network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/networks_associate.py:27
+#: nova/api/openstack/compute/contrib/networks_associate.py:38
+#: nova/api/openstack/compute/contrib/networks_associate.py:50
+#: nova/api/openstack/compute/contrib/os_networks.py:79
+#: nova/api/openstack/compute/contrib/os_networks.py:89
+#: nova/api/openstack/compute/contrib/os_networks.py:99
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:110
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:132
+msgid "Network not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/networks_associate.py:34
+#, python-format
+msgid "Disassociating project with network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:74
+#, python-format
+msgid "Disassociating network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:85
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:106
+#, python-format
+msgid "Showing network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:95
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:124
+#, python-format
+msgid "Deleting network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:110
+msgid "Missing network in body"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:114
+msgid "Network label is required"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:118
+msgid "Network cidr or cidr_v6 is required"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:120
+#, python-format
+msgid "Creating network with label %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:136
+#, python-format
+msgid "Associating network %(network)s with project %(project)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:144
+msgid "VLAN support must be enabled"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_networks.py:147
+#, python-format
+msgid "Cannot associate network %(network)s with project %(project)s: %(message)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:121
+msgid "Failed to update usages deallocating network."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:151
+msgid "No CIDR requested"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:157
+msgid "Requested network does not contain enough (2+) usable hosts"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:161
+msgid "CIDR is malformed."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:164
+msgid "Address could not be converted."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:172
+msgid "Quota exceeded, too many networks."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/os_tenant_networks.py:183
+msgid "Create networks failed"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:65
+msgid "Quota limit must be -1 or greater."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:100
+#, python-format
+msgid "Bad key(s) %s in quota_set"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:107
+#, python-format
+msgid "Quota for %s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/scheduler_hints.py:38
+msgid "Malformed scheduler_hints attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
+#: nova/api/openstack/compute/contrib/security_groups.py:324
+msgid "Not enough parameters to build a valid rule."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_group_default_rules.py:133
+msgid "This default rule already exists."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_group_default_rules.py:154
+#, python-format
+msgid "Showing security_group_default_rule with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_group_default_rules.py:158
+msgid "security group default rule not found"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_groups.py:332
+#, python-format
+msgid "Bad prefix for network in cidr %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_groups.py:416
+msgid "Security group not specified"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_groups.py:420
+msgid "Security group name cannot be empty"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+msgid "start instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+msgid "stop instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:123
+msgid "Unknown action"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:137
+msgid "Unknown service"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+msgid "Invalid start time. The start time cannot occur after the end time."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:75
+#, python-format
+msgid "vol=%s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:187
+#, python-format
+msgid "Delete volume with id: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
+#, python-format
+msgid "Instance %s is not attached."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:380
+#, python-format
+msgid "Bad volumeId format: volumeId is not in proper format (%s)"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:399
+#, python-format
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:579
+#, python-format
+msgid "Delete snapshot with id: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:619
+#, python-format
+msgid "Create snapshot from volume %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:626
+#, python-format
+msgid "Invalid value '%s' for force."
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:60
+#, python-format
+msgid "Reserving IP address %s"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:63
+#, python-format
+msgid "Unreserving IP address %s"
+msgstr ""
+
+#: nova/api/openstack/compute/views/servers.py:186
+msgid "Instance has had its instance_type removed from the DB"
+msgstr ""
+
+#: nova/cells/messaging.py:204
+#, python-format
+msgid "Error processing message locally: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
+#, python-format
+msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
+msgstr ""
+
+#: nova/cells/messaging.py:380
+#, python-format
+msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
+msgstr ""
+
+#: nova/cells/messaging.py:404
+#, python-format
+msgid "Error locating next hop for message: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:431
+#, python-format
+msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:510
+#, python-format
+msgid "Error locating next hops for message: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:530
+#, python-format
+msgid "Error sending message to next hops: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:548
+#, python-format
+msgid "Error waiting for responses from neighbor cells: %(exc)s"
+msgstr ""
+
+#: nova/cells/messaging.py:659
+#, python-format
+msgid "Unknown method '%(method)s' in compute API"
+msgstr ""
+
+#: nova/cells/messaging.py:682
+#, python-format
+msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
+msgstr ""
+
+#: nova/cells/messaging.py:692
+#, python-format
+msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
+msgstr ""
+
+#: nova/cells/messaging.py:819
+#, python-format
+msgid "Got update for instance: %(instance)s"
+msgstr ""
+
+#: nova/cells/messaging.py:862
+msgid "Got update to delete instance"
+msgstr ""
+
+#: nova/cells/messaging.py:877
+#, python-format
+msgid "Got broadcast to %(delete_type)s delete instance"
+msgstr ""
+
+#: nova/cells/messaging.py:891
+#, python-format
+msgid "Got message to create instance fault: %(instance_fault)s"
+msgstr ""
+
+#: nova/cells/messaging.py:912
+#, python-format
+msgid ""
+"Forcing a sync of instances, project_id=%(projid_str)s, "
+"updated_since=%(since_str)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1097
+#, python-format
+msgid "Updating parents with our capabilities: %(capabs)s"
+msgstr ""
+
+#: nova/cells/messaging.py:1117
+#, python-format
+msgid "Updating parents with our capacities: %(capacities)s"
+msgstr ""
+
+#: nova/cells/scheduler.py:106
+#, python-format
+msgid "Scheduling with routing_path=%(routing_path)s"
+msgstr ""
+
+#: nova/cells/scheduler.py:132
+#, python-format
+msgid ""
+"No cells available when scheduling.  Will retry in %(sleep_time)s "
+"second(s)"
+msgstr ""
+
+#: nova/cells/scheduler.py:140
+#, python-format
+msgid "Error scheduling instances %(instance_uuids)s"
+msgstr ""
+
+#: nova/cells/state.py:270
+msgid "Updating cell cache from db."
+msgstr ""
+
+#: nova/cells/state.py:315
+#, python-format
+msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
+msgstr ""
+
+#: nova/cells/state.py:331
+#, python-format
+msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:48
+msgid "Instance type for vpn instances"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:51
+msgid "Template for cloudpipe instance boot script"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:54
+msgid "Network to push into openvpn config"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:57
+msgid "Netmask to push into openvpn config"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:126
+#, python-format
+msgid "Launching VPN for %s"
+msgstr ""
+
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
+#, python-format
+msgid "Failed to load %s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:236
+#, python-format
+msgid "start deployment for node %(node_id)s, params %(params)s"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:244
+#, python-format
+msgid "deployment to node %s failed"
+msgstr ""
+
+#: nova/cmd/baremetal_deploy_helper.py:248
+#, python-format
+msgid "deployment to node %s done"
+msgstr ""
+
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#, python-format
+msgid "Could not read %s. Re-running with sudo"
+msgstr ""
+
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+msgid "sudo failed, continuing as if nothing happened"
+msgstr ""
+
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+msgid "Please re-run nova-manage as root."
+msgstr ""
+
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+msgid "Command failed, please check log for more info"
+msgstr ""
+
+#: nova/cmd/dhcpbridge.py:46
+msgid "leasing ip"
+msgstr ""
+
+#: nova/cmd/dhcpbridge.py:66
+msgid "releasing ip"
+msgstr ""
+
+#: nova/cmd/dhcpbridge.py:121
+#, python-format
+msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
+msgstr ""
+
+#: nova/cmd/dhcpbridge.py:131
+msgid "Environment variable 'NETWORK_ID' must be set."
+msgstr ""
+
+#: nova/cmd/manage.py:202
+msgid ""
+"The above error may show that the database has not been created.\n"
+"Please create a database using 'nova-manage db sync' before running this "
+"command."
+msgstr ""
+
+#: nova/cmd/manage.py:237
+#, python-format
+msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
+msgstr ""
+
+#: nova/cmd/manage.py:243
+msgid "Quota"
+msgstr ""
+
+#: nova/cmd/manage.py:244
+msgid "Limit"
+msgstr ""
+
+#: nova/cmd/manage.py:245
+msgid "In Use"
+msgstr ""
+
+#: nova/cmd/manage.py:246
+msgid "Reserved"
+msgstr ""
+
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
+#, python-format
+msgid "error: %s"
+msgstr ""
+
+#: nova/cmd/manage.py:294
+msgid "network"
+msgstr ""
+
+#: nova/cmd/manage.py:295
+msgid "IP address"
+msgstr ""
+
+#: nova/cmd/manage.py:296
+msgid "hostname"
+msgstr ""
+
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+msgid "host"
+msgstr ""
+
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+msgid "No fixed IP found."
+msgstr ""
+
+#: nova/cmd/manage.py:325
+#, python-format
+msgid "WARNING: fixed ip %s allocated to missing instance"
+msgstr ""
+
+#: nova/cmd/manage.py:384
+#, python-format
+msgid ""
+"Too many IP addresses will be generated.  Please increase /%s to reduce "
+"the number generated."
+msgstr ""
+
+#: nova/cmd/manage.py:433
+msgid "No floating IP addresses have been defined."
+msgstr ""
+
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+msgid "id"
+msgstr ""
+
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+msgid "IPv4"
+msgstr ""
+
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+msgid "IPv6"
+msgstr ""
+
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+msgid "start address"
+msgstr ""
+
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+msgid "DNS1"
+msgstr ""
+
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+msgid "DNS2"
+msgstr ""
+
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+msgid "VlanID"
+msgstr ""
+
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/tests/test_nova_manage.py:219
+msgid "project"
+msgstr ""
+
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+msgid "uuid"
+msgstr ""
+
+#: nova/cmd/manage.py:510
+msgid "No networks found"
+msgstr ""
+
+#: nova/cmd/manage.py:529
+msgid "Please specify either fixed_range or uuid"
+msgstr ""
+
+#: nova/cmd/manage.py:534
+msgid "UUID is required to delete Quantum Networks"
+msgstr ""
+
+#: nova/cmd/manage.py:537
+msgid "Deleting by fixed_range is not supported with the QuantumManager"
+msgstr ""
+
+#: nova/cmd/manage.py:600
+msgid "instance"
+msgstr ""
+
+#: nova/cmd/manage.py:601
+msgid "node"
+msgstr ""
+
+#: nova/cmd/manage.py:602
+msgid "type"
+msgstr ""
+
+#: nova/cmd/manage.py:603
+msgid "state"
+msgstr ""
+
+#: nova/cmd/manage.py:604
+msgid "launched"
+msgstr ""
+
+#: nova/cmd/manage.py:605
+msgid "image"
+msgstr ""
+
+#: nova/cmd/manage.py:606
+msgid "kernel"
+msgstr ""
+
+#: nova/cmd/manage.py:607
+msgid "ramdisk"
+msgstr ""
+
+#: nova/cmd/manage.py:609
+msgid "user"
+msgstr ""
+
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+msgid "zone"
+msgstr ""
+
+#: nova/cmd/manage.py:611
+msgid "index"
+msgstr ""
+
+#: nova/cmd/manage.py:656
+msgid "Binary"
+msgstr ""
+
+#: nova/cmd/manage.py:657
+msgid "Host"
+msgstr ""
+
+#: nova/cmd/manage.py:658
+msgid "Zone"
+msgstr ""
+
+#: nova/cmd/manage.py:659
+msgid "Status"
+msgstr ""
+
+#: nova/cmd/manage.py:660
+msgid "State"
+msgstr ""
+
+#: nova/cmd/manage.py:661
+msgid "Updated_At"
+msgstr ""
+
+#: nova/cmd/manage.py:683
+#, python-format
+msgid "Service %(service)s on host %(host)s enabled."
+msgstr ""
+
+#: nova/cmd/manage.py:696
+#, python-format
+msgid "Service %(service)s on host %(host)s disabled."
+msgstr ""
+
+#: nova/cmd/manage.py:763
+msgid "An unexpected error has occurred."
+msgstr ""
+
+#: nova/cmd/manage.py:764
+msgid "[Result]"
+msgstr ""
+
+#: nova/cmd/manage.py:768
+msgid "HOST"
+msgstr ""
+
+#: nova/cmd/manage.py:769
+msgid "PROJECT"
+msgstr ""
+
+#: nova/cmd/manage.py:770
+msgid "cpu"
+msgstr ""
+
+#: nova/cmd/manage.py:771
+msgid "mem(mb)"
+msgstr ""
+
+#: nova/cmd/manage.py:772
+msgid "hdd"
+msgstr ""
+
+#: nova/cmd/manage.py:854
+msgid "Must supply a positive value for max_rows"
+msgstr ""
+
+#: nova/cmd/manage.py:893
+msgid "Must supply valid parameters to create instance_type"
+msgstr ""
+
+#: nova/cmd/manage.py:897
+msgid "Instance Type exists."
+msgstr ""
+
+#: nova/cmd/manage.py:898
+msgid "Please ensure instance_type name and flavorid are unique."
+msgstr ""
+
+#: nova/cmd/manage.py:900
+msgid "Currently defined instance_type names and flavorids:"
+msgstr ""
+
+#: nova/cmd/manage.py:905
+msgid "Unknown error"
+msgstr ""
+
+#: nova/cmd/manage.py:908
+#, python-format
+msgid "%s created"
+msgstr ""
+
+#: nova/cmd/manage.py:916
+msgid "Valid instance type name is required"
+msgstr ""
+
+#: nova/cmd/manage.py:919
+#, python-format
+msgid "DB Error: %s"
+msgstr ""
+
+#: nova/cmd/manage.py:924
+#, python-format
+msgid "%s deleted"
+msgstr ""
+
+#: nova/cmd/manage.py:960
+#, python-format
+msgid "Key %(key)s set to %(value)s on instance type %(name)s"
+msgstr ""
+
+#: nova/cmd/manage.py:982
+#, python-format
+msgid "Key %(key)s on instance type %(name)s unset"
+msgstr ""
+
+#: nova/cmd/manage.py:1026
+#, python-format
+msgid "Hypervisor: %s"
+msgstr ""
+
+#: nova/cmd/manage.py:1067
+#, python-format
+msgid "Line %(linenum)d : %(line)s"
+msgstr ""
+
+#: nova/cmd/manage.py:1069
+msgid "No errors in logfiles!"
+msgstr ""
+
+#: nova/cmd/manage.py:1081
+msgid "Unable to find system log file!"
+msgstr ""
+
+#: nova/cmd/manage.py:1085
+#, python-format
+msgid "Last %s nova syslog entries:-"
+msgstr ""
+
+#: nova/cmd/manage.py:1094
+msgid "No nova entries in syslog!"
+msgstr ""
+
+#: nova/compute/api.py:282
+msgid "Cannot run any more instances of this type."
+msgstr ""
+
+#: nova/compute/api.py:289
+#, python-format
+msgid "Can only run %s more instances of this type."
+msgstr ""
+
+#: nova/compute/api.py:298
+#, python-format
+msgid ""
+"%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
+"instances. %(msg)s"
+msgstr ""
+
+#: nova/compute/api.py:318
+#, python-format
+msgid ""
+"Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
+"properties"
+msgstr ""
+
+#: nova/compute/api.py:328
+msgid "Metadata property key blank"
+msgstr ""
+
+#: nova/compute/api.py:332
+msgid "Metadata property key greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:336
+msgid "Metadata property value greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:469
+msgid "Failed to set instance name using multi_instance_display_name_template."
+msgstr ""
+
+#: nova/compute/api.py:529
+msgid "Cannot attach one or more volumes to multiple instances"
+msgstr ""
+
+#: nova/compute/api.py:634
+#, python-format
+msgid "Going to run %s instances..."
+msgstr ""
+
+#: nova/compute/api.py:750
+#, python-format
+msgid "bdm %s"
+msgstr ""
+
+#: nova/compute/api.py:777
+#, python-format
+msgid "block_device_mapping %s"
+msgstr ""
+
+#: nova/compute/api.py:1048
+msgid "instance termination disabled"
+msgstr ""
+
+#: nova/compute/api.py:1184
+#, python-format
+msgid "instance type %(old_inst_type_id)d not found"
+msgstr ""
+
+#: nova/compute/api.py:1190
+msgid "going to delete a resizing instance"
+msgstr ""
+
+#: nova/compute/api.py:1200
+#, python-format
+msgid "instance's host %s is down, deleting from database"
+msgstr ""
+
+#: nova/compute/api.py:1243
+msgid "Going to try to soft delete instance"
+msgstr ""
+
+#: nova/compute/api.py:1267
+msgid "Going to try to terminate instance"
+msgstr ""
+
+#: nova/compute/api.py:1317
+msgid "Going to try to stop instance"
+msgstr ""
+
+#: nova/compute/api.py:1334
+msgid "Going to try to start instance"
+msgstr ""
+
+#: nova/compute/api.py:1407
+#, python-format
+msgid "Searching by: %s"
+msgstr ""
+
+#: nova/compute/api.py:1644
+#, python-format
+msgid "snapshot for %s"
+msgstr ""
+
+#: nova/compute/api.py:1988
+msgid "flavor_id is None. Assuming migration."
+msgstr ""
+
+#: nova/compute/api.py:1997
+#, python-format
+msgid ""
+"Old instance type %(current_instance_type_name)s,  new instance type "
+"%(new_instance_type_name)s"
+msgstr ""
+
+#: nova/compute/api.py:2043
+#, python-format
+msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
+msgstr ""
+
+#: nova/compute/api.py:2179
+msgid "Cannot rescue a volume-backed instance"
+msgstr ""
+
+#: nova/compute/api.py:2284
+msgid "Locking"
+msgstr ""
+
+#: nova/compute/api.py:2292
+msgid "Unlocking"
+msgstr ""
+
+#: nova/compute/api.py:2364
+msgid "Volume must be attached in order to detach."
+msgstr ""
+
+#: nova/compute/api.py:2477
+#, python-format
+msgid "Going to try to live migrate instance to %s"
+msgstr ""
+
+#: nova/compute/api.py:2496
+msgid "vm evacuation scheduled"
+msgstr ""
+
+#: nova/compute/api.py:2500
+#, python-format
+msgid ""
+"Instance compute service state on %(inst_host)s expected to be down, but "
+"it was up."
+msgstr ""
+
+#: nova/compute/api.py:2747
+msgid "Keypair name contains unsafe characters"
+msgstr ""
+
+#: nova/compute/api.py:2751
+msgid "Keypair name must be between 1 and 255 characters long"
+msgstr ""
+
+#: nova/compute/api.py:2847
+#, python-format
+msgid "Security group %s is not a string or unicode"
+msgstr ""
+
+#: nova/compute/api.py:2850
+#, python-format
+msgid "Security group %s cannot be empty."
+msgstr ""
+
+#: nova/compute/api.py:2858
+#, python-format
+msgid ""
+"Value (%(value)s) for parameter Group%(property)s is invalid. Content "
+"limited to '%(allowed)'."
+msgstr ""
+
+#: nova/compute/api.py:2864
+#, python-format
+msgid "Security group %s should not be greater than 255 characters."
+msgstr ""
+
+#: nova/compute/api.py:2882
+msgid "Quota exceeded, too many security groups."
+msgstr ""
+
+#: nova/compute/api.py:2885
+#, python-format
+msgid "Create Security Group %s"
+msgstr ""
+
+#: nova/compute/api.py:2892
+#, python-format
+msgid "Security group %s already exists"
+msgstr ""
+
+#: nova/compute/api.py:2956
+#, python-format
+msgid "Unable to delete system group '%s'"
+msgstr ""
+
+#: nova/compute/api.py:2961
+msgid "Security group is still in use"
+msgstr ""
+
+#: nova/compute/api.py:2969
+msgid "Failed to update usages deallocating security group"
+msgstr ""
+
+#: nova/compute/api.py:2972
+#, python-format
+msgid "Delete security group %s"
+msgstr ""
+
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
+#, python-format
+msgid "Rule (%s) not found"
+msgstr ""
+
+#: nova/compute/api.py:3065
+msgid "Quota exceeded, too many security group rules."
+msgstr ""
+
+#: nova/compute/api.py:3068
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr ""
+
+#: nova/compute/api.py:3077
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr ""
+
+#: nova/compute/api.py:3130
+msgid "Security group id should be integer"
+msgstr ""
+
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
+#, python-format
+msgid "Aborting claim: %s"
+msgstr ""
+
+#: nova/compute/claims.py:113
+#, python-format
+msgid ""
+"Attempting claim: memory %(memory_mb)d MB, disk %(disk_gb)d GB, VCPUs "
+"%(vcpus)d"
+msgstr ""
+
+#: nova/compute/claims.py:125
+msgid "Claim successful"
+msgstr ""
+
+#: nova/compute/claims.py:127
+msgid "Claim failed"
+msgstr ""
+
+#: nova/compute/claims.py:132
+msgid "Memory"
+msgstr ""
+
+#: nova/compute/claims.py:141
+msgid "Disk"
+msgstr ""
+
+#: nova/compute/claims.py:150
+msgid "CPU"
+msgstr ""
+
+#: nova/compute/claims.py:162
+#, python-format
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
+msgstr ""
+
+#: nova/compute/claims.py:169
+#, python-format
+msgid "%(type)s limit not specified, defaulting to unlimited"
+msgstr ""
+
+#: nova/compute/claims.py:176
+#, python-format
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
+msgstr ""
+
+#: nova/compute/claims.py:184
+#, python-format
+msgid ""
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
+msgstr ""
+
+#: nova/compute/flavors.py:90
+msgid "names can only contain [a-zA-Z0-9_.- ]"
+msgstr ""
+
+#: nova/compute/flavors.py:99
+#, python-format
+msgid "'%s' argument must be greater than 0"
+msgstr ""
+
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
+msgstr ""
+
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
+msgstr ""
+
+#: nova/compute/flavors.py:130
+msgid "is_public must be a boolean"
+msgstr ""
+
+#: nova/compute/flavors.py:135
+#, python-format
+msgid "DB error: %s"
+msgstr ""
+
+#: nova/compute/flavors.py:145
+#, python-format
+msgid "Instance type %s not found for deletion"
+msgstr ""
+
+#: nova/compute/manager.py:205
+msgid "Possibly task preempted."
+msgstr ""
+
+#: nova/compute/manager.py:363
+#, python-format
+msgid "%(nodename)s is not a valid node managed by this compute host."
+msgstr ""
+
+#: nova/compute/manager.py:392
+msgid "Instance has been destroyed from under us while trying to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:409
+#, python-format
+msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+msgstr ""
+
+#: nova/compute/manager.py:425
+#, python-format
+msgid ""
+"Instance %(driver_instance)s found in the hypervisor, but not in the "
+"database"
+msgstr ""
+
+#: nova/compute/manager.py:446
+#, python-format
+msgid ""
+"Deleting instance as its host (%(instance_host)s) is not equal to our "
+"host (%(our_host)s)."
+msgstr ""
+
+#: nova/compute/manager.py:461
+msgid "Instance has been marked deleted already, removing it from the hypervisor."
+msgstr ""
+
+#: nova/compute/manager.py:482
+msgid ""
+"Hypervisor driver does not support instance shared storage check, "
+"assuming it's not on shared storage"
+msgstr ""
+
+#: nova/compute/manager.py:488
+msgid "Failed to check if instance shared"
+msgstr ""
+
+#: nova/compute/manager.py:531
+msgid "Failed to revert crashed migration"
+msgstr ""
+
+#: nova/compute/manager.py:534
+msgid "Instance found in migrating state during startup. Resetting task_state"
+msgstr ""
+
+#: nova/compute/manager.py:545
+#, python-format
+msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
+msgstr ""
+
+#: nova/compute/manager.py:550
+msgid "Rebooting instance after nova-compute restart."
+msgstr ""
+
+#: nova/compute/manager.py:564
+msgid "Hypervisor driver does not support resume guests"
+msgstr ""
+
+#: nova/compute/manager.py:569
+msgid "Failed to resume instance"
+msgstr ""
+
+#: nova/compute/manager.py:579
+msgid "Hypervisor driver does not support firewall rules"
+msgstr ""
+
+#: nova/compute/manager.py:583
+#, python-format
+msgid "Lifecycle event %(state)d on VM %(uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:599
+#, python-format
+msgid "Unexpected power state %d"
+msgstr ""
+
+#: nova/compute/manager.py:611
+#, python-format
+msgid "Ignoring event %s"
+msgstr ""
+
+#: nova/compute/manager.py:649
+msgid "Checking state"
+msgstr ""
+
+#: nova/compute/manager.py:747
+#, python-format
+msgid "Volume id: %s finished being created but was not set as 'available'"
+msgstr ""
+
+#: nova/compute/manager.py:764
+#, python-format
+msgid "Setting up bdm %s"
+msgstr ""
+
+#: nova/compute/manager.py:864
+msgid "Success"
+msgstr ""
+
+#: nova/compute/manager.py:887
+msgid "Instance disappeared before we could start it"
+msgstr ""
+
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
+#, python-format
+msgid "No node specified, defaulting to %(node)s"
+msgstr ""
+
+#: nova/compute/manager.py:950
+msgid "Failed to dealloc network for deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:956
+msgid "Instance was deleted during spawn."
+msgstr ""
+
+#: nova/compute/manager.py:984
+#, python-format
+msgid "Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:1001
+msgid "Clean up resource before rescheduling."
+msgstr ""
+
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
+msgid "Error trying to reschedule"
+msgstr ""
+
+#: nova/compute/manager.py:1039
+msgid "Retry info not present, will not reschedule"
+msgstr ""
+
+#: nova/compute/manager.py:1044
+msgid "No request spec, will not reschedule"
+msgstr ""
+
+#: nova/compute/manager.py:1050
+#, python-format
+msgid "Re-scheduling %(method)s: attempt %(num)d"
+msgstr ""
+
+#: nova/compute/manager.py:1079
+msgid "Instance build timed out. Set to error state."
+msgstr ""
+
+#: nova/compute/manager.py:1127
+#, python-format
+msgid ""
+"image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
+"allowed_size_bytes=%(allowed_size_bytes)d"
+msgstr ""
+
+#: nova/compute/manager.py:1133
+#, python-format
+msgid ""
+"Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
+"size %(allowed_size_bytes)d"
+msgstr ""
+
+#: nova/compute/manager.py:1143
+msgid "Starting instance..."
+msgstr ""
+
+#: nova/compute/manager.py:1169
+msgid "Instance failed network setup"
+msgstr ""
+
+#: nova/compute/manager.py:1172
+#, python-format
+msgid "Instance network_info: |%s|"
+msgstr ""
+
+#: nova/compute/manager.py:1183
+msgid "Instance failed block device setup"
+msgstr ""
+
+#: nova/compute/manager.py:1202
+msgid "Instance failed to spawn"
+msgstr ""
+
+#: nova/compute/manager.py:1253
+msgid "Deallocating network for instance"
+msgstr ""
+
+#: nova/compute/manager.py:1324
+#, python-format
+msgid "%(action_str)s instance"
+msgstr ""
+
+#: nova/compute/manager.py:1340
+msgid "Failed to deallocate network for instance."
+msgstr ""
+
+#: nova/compute/manager.py:1360
+#, python-format
+msgid "Ignoring DiskNotFound: %s"
+msgstr ""
+
+#: nova/compute/manager.py:1363
+#, python-format
+msgid "Ignoring VolumeNotFound: %s"
+msgstr ""
+
+#: nova/compute/manager.py:1370
+#, python-format
+msgid "terminating bdm %s"
+msgstr ""
+
+#: nova/compute/manager.py:1417
+#, python-format
+msgid "Ignoring volume cleanup failure due to %s"
+msgstr ""
+
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
+#, python-format
+msgid "%s. Setting instance vm_state to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:1622
+msgid "Rebuilding instance"
+msgstr ""
+
+#: nova/compute/manager.py:1635
+msgid "Invalid state of instance files on shared storage"
+msgstr ""
+
+#: nova/compute/manager.py:1639
+msgid "disk on shared storage, recreating using existing disk"
+msgstr ""
+
+#: nova/compute/manager.py:1643
+#, python-format
+msgid "disk not on shared storagerebuilding from: '%s'"
+msgstr ""
+
+#: nova/compute/manager.py:1726
+#, python-format
+msgid "bringing vm to original state: '%s'"
+msgstr ""
+
+#: nova/compute/manager.py:1758
+#, python-format
+msgid "Detaching from volume api: %s"
+msgstr ""
+
+#: nova/compute/manager.py:1776
+msgid "Rebooting instance"
+msgstr ""
+
+#: nova/compute/manager.py:1801
+#, python-format
+msgid ""
+"trying to reboot a non-running instance: (state: %(state)s expected: "
+"%(running)s)"
+msgstr ""
+
+#: nova/compute/manager.py:1817
+#, python-format
+msgid "Cannot reboot instance: %(exc)s"
+msgstr ""
+
+#: nova/compute/manager.py:1830
+msgid "Instance disappeared during reboot"
+msgstr ""
+
+#: nova/compute/manager.py:1857
+msgid "instance snapshotting"
+msgstr ""
+
+#: nova/compute/manager.py:1863
+#, python-format
+msgid ""
+"trying to snapshot a non-running instance: (state: %(state)s expected: "
+"%(running)s)"
+msgstr ""
+
+#: nova/compute/manager.py:1924
+#, python-format
+msgid "Found %(num_images)d images (rotation: %(rotation)d)"
+msgstr ""
+
+#: nova/compute/manager.py:1931
+#, python-format
+msgid "Rotating out %d backups"
+msgstr ""
+
+#: nova/compute/manager.py:1936
+#, python-format
+msgid "Deleting image %s"
+msgstr ""
+
+#: nova/compute/manager.py:1964
+#, python-format
+msgid "Failed to set admin password. Instance %s is not running"
+msgstr ""
+
+#: nova/compute/manager.py:1971
+msgid "Root password set"
+msgstr ""
+
+#: nova/compute/manager.py:1978
+msgid "set_admin_password is not implemented by this driver or guest instance."
+msgstr ""
+
+#: nova/compute/manager.py:1993
+#, python-format
+msgid "set_admin_password failed: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2000
+msgid "error setting admin password"
+msgstr ""
+
+#: nova/compute/manager.py:2013
+#, python-format
+msgid ""
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
+msgstr ""
+
+#: nova/compute/manager.py:2017
+#, python-format
+msgid "injecting file to %(path)s"
+msgstr ""
+
+#: nova/compute/manager.py:2037
+msgid ""
+"Unable to find a different image to use for rescue VM, using instance's "
+"current image"
+msgstr ""
+
+#: nova/compute/manager.py:2050
+msgid "Rescuing"
+msgstr ""
+
+#: nova/compute/manager.py:2069
+msgid "Error trying to Rescue Instance"
+msgstr ""
+
+#: nova/compute/manager.py:2073
+#, python-format
+msgid "Driver Error: %s"
+msgstr ""
+
+#: nova/compute/manager.py:2091
+msgid "Unrescuing"
+msgstr ""
+
+#: nova/compute/manager.py:2112
+#, python-format
+msgid "Changing instance metadata according to %(diff)r"
+msgstr ""
+
+#: nova/compute/manager.py:2337
+msgid "Instance has no source host"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+msgid "destination same as source!"
+msgstr ""
+
+#: nova/compute/manager.py:2360
+msgid "Migrating"
+msgstr ""
+
+#: nova/compute/manager.py:2605
+#, python-format
+msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgstr ""
+
+#: nova/compute/manager.py:2668
+msgid "Pausing"
+msgstr ""
+
+#: nova/compute/manager.py:2686
+msgid "Unpausing"
+msgstr ""
+
+#: nova/compute/manager.py:2724
+msgid "Retrieving diagnostics"
+msgstr ""
+
+#: nova/compute/manager.py:2755
+msgid "Resuming"
+msgstr ""
+
+#: nova/compute/manager.py:2775
+msgid "Reset network"
+msgstr ""
+
+#: nova/compute/manager.py:2780
+msgid "Inject network info"
+msgstr ""
+
+#: nova/compute/manager.py:2783
+#, python-format
+msgid "network_info to inject: |%s|"
+msgstr ""
+
+#: nova/compute/manager.py:2800
+msgid "Get console output"
+msgstr ""
+
+#: nova/compute/manager.py:2827
+msgid "Getting vnc console"
+msgstr ""
+
+#: nova/compute/manager.py:2862
+msgid "Getting spice console"
+msgstr ""
+
+#: nova/compute/manager.py:2909
+#, python-format
+msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
+msgstr ""
+
+#: nova/compute/manager.py:2959
+#, python-format
+msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
+msgstr ""
+
+#: nova/compute/manager.py:2968
+#, python-format
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
+msgstr ""
+
+#: nova/compute/manager.py:2983
+#, python-format
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
+msgstr ""
+
+#: nova/compute/manager.py:3013
+#, python-format
+msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
+msgstr ""
+
+#: nova/compute/manager.py:3023
+msgid "Detaching volume from unknown instance"
+msgstr ""
+
+#: nova/compute/manager.py:3030
+#, python-format
+msgid "Failed to detach volume %(volume_id)s from %(mp)s"
+msgstr ""
+
+#: nova/compute/manager.py:3053
+msgid "Updating volume usage cache with totals"
+msgstr ""
+
+#: nova/compute/manager.py:3089
+#, python-format
+msgid "allocate_port_for_instance returned %(ports)s ports"
+msgstr ""
+
+#: nova/compute/manager.py:3109
+#, python-format
+msgid "Port %(port_id)s is not attached"
+msgstr ""
+
+#: nova/compute/manager.py:3123
+#, python-format
+msgid "Host %(host)s not found"
+msgstr ""
+
+#: nova/compute/manager.py:3276
+#, python-format
+msgid "Pre live migration failed at  %(dest)s"
+msgstr ""
+
+#: nova/compute/manager.py:3304
+msgid "_post_live_migration() is started.."
+msgstr ""
+
+#: nova/compute/manager.py:3359
+#, python-format
+msgid "Migrating instance to %(dest)s finished successfully."
+msgstr ""
+
+#: nova/compute/manager.py:3361
+msgid ""
+"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
+"with matching name.\" This error can be safely ignored."
+msgstr ""
+
+#: nova/compute/manager.py:3376
+msgid "Post operation of migration started"
+msgstr ""
+
+#: nova/compute/manager.py:3408
+#, python-format
+msgid "Failed to get compute_info for %s"
+msgstr ""
+
+#: nova/compute/manager.py:3537
+msgid "Updated the info_cache for instance"
+msgstr ""
+
+#: nova/compute/manager.py:3587
+#, python-format
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
+
+#: nova/compute/manager.py:3593
+#, python-format
+msgid "Setting migration %(migration_id)s to error: %(reason)s"
+msgstr ""
+
+#: nova/compute/manager.py:3602
+#, python-format
+msgid ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/compute/manager.py:3609
+#, python-format
+msgid "Instance %(instance_uuid)s not found"
+msgstr ""
+
+#: nova/compute/manager.py:3613
+msgid "In ERROR state"
+msgstr ""
+
+#: nova/compute/manager.py:3620
+#, python-format
+msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
+msgstr ""
+
+#: nova/compute/manager.py:3629
+#, python-format
+msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgstr ""
+
+#: nova/compute/manager.py:3646
+#, python-format
+msgid ""
+"Running instance usage audit for host %(host)s from %(begin_time)s to "
+"%(end_time)s. %(number_instances)s instances."
+msgstr ""
+
+#: nova/compute/manager.py:3665
+#, python-format
+msgid "Failed to generate usage audit for instance on host %s"
+msgstr ""
+
+#: nova/compute/manager.py:3689
+msgid "Updating bandwidth usage cache"
+msgstr ""
+
+#: nova/compute/manager.py:3806
+msgid "Updating volume usage cache"
+msgstr ""
+
+#: nova/compute/manager.py:3823
+msgid "Updating host status"
+msgstr ""
+
+#: nova/compute/manager.py:3850
+#, python-format
+msgid ""
+"Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
+"the hypervisor."
+msgstr ""
+
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
+msgid "During sync_power_state the instance has a pending task. Skip."
+msgstr ""
+
+#: nova/compute/manager.py:3892
+#, python-format
+msgid ""
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:3930
+msgid "Instance shutdown by itself. Calling the stop API."
+msgstr ""
+
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
+msgid "error during stop() in sync_power_state."
+msgstr ""
+
+#: nova/compute/manager.py:3946
+msgid "Instance is suspended unexpectedly. Calling the stop API."
+msgstr ""
+
+#: nova/compute/manager.py:3962
+msgid "Instance is paused unexpectedly. Ignore."
+msgstr ""
+
+#: nova/compute/manager.py:3968
+msgid "Instance is unexpectedly not found. Ignore."
+msgstr ""
+
+#: nova/compute/manager.py:3974
+msgid "Instance is not stopped. Calling the stop API."
+msgstr ""
+
+#: nova/compute/manager.py:3990
+msgid "Instance is not (soft-)deleted."
+msgstr ""
+
+#: nova/compute/manager.py:3998
+msgid "CONF.reclaim_instance_interval <= 0, skipping..."
+msgstr ""
+
+#: nova/compute/manager.py:4010
+msgid "Reclaiming deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:4037
+#, python-format
+msgid "Deleting orphan compute node %s"
+msgstr ""
+
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
+#, python-format
+msgid "No service record for host %s"
+msgstr ""
+
+#: nova/compute/manager.py:4088
+#, python-format
+msgid ""
+"Detected instance with name label '%(name)s' which is marked as DELETED "
+"but still present on host."
+msgstr ""
+
+#: nova/compute/manager.py:4095
+#, python-format
+msgid ""
+"Destroying instance with name label '%(name)s' which is marked as DELETED"
+" but still present on host."
+msgstr ""
+
+#: nova/compute/manager.py:4102
+#, python-format
+msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgstr ""
+
+#: nova/compute/manager.py:4129
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:92
+msgid ""
+"Host field should not be set on the instance until resources have been "
+"claimed."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:97
+msgid ""
+"Node field should be not be set on the instance until resources have been"
+" claimed."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:244
+msgid "Auditing locally available compute resources"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:249
+msgid ""
+"Virt driver does not support 'get_available_resource'  Compute tracking "
+"is disabled."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:301
+#, python-format
+msgid "Compute_service record created for %(host)s:%(node)s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:307
+#, python-format
+msgid "Compute_service record updated for %(host)s:%(node)s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:331
+#, python-format
+msgid "Hypervisor: free ram (MB): %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:332
+#, python-format
+msgid "Hypervisor: free disk (GB): %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:337
+#, python-format
+msgid "Hypervisor: free VCPUs: %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:339
+msgid "Hypervisor: VCPU information unavailable"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:346
+#, python-format
+msgid "Free ram (MB): %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:347
+#, python-format
+msgid "Free disk (GB): %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:352
+#, python-format
+msgid "Free VCPUS: %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:354
+msgid "Free VCPU information unavailable"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:383
+#, python-format
+msgid "Updating from migration %s"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:443
+msgid "Instance not resizing, skipping migration."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:458
+msgid "InstanceType could not be found, skipping migration."
+msgstr ""
+
+#: nova/compute/resource_tracker.py:542
+#, python-format
+msgid ""
+"Detected running orphan instance: %(uuid)s (consuming %(memory_mb)s MB "
+"memory"
+msgstr ""
+
+#: nova/compute/resource_tracker.py:555
+#, python-format
+msgid "Missing keys: %s"
+msgstr ""
+
+#: nova/compute/rpcapi.py:51
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/rpcapi.py:54
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/utils.py:141
+#, python-format
+msgid "Using %(prefix)s instead of %(req_prefix)s"
+msgstr ""
+
+#: nova/conductor/api.py:373
+msgid ""
+"Timed out waiting for nova-conductor. Is it running? Or did this service "
+"start before nova-conductor?"
+msgstr ""
+
+#: nova/conductor/manager.py:91
+#, python-format
+msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
+msgstr ""
+
+#: nova/conductor/manager.py:263
+msgid "Invalid block_device_mapping_destroy invocation"
+msgstr ""
+
+#: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
+msgid "Adding console"
+msgstr ""
+
+#: nova/console/manager.py:101 nova/console/vmrc_manager.py:113
+#, python-format
+msgid "Tried to remove non-existent console %(console_id)s."
+msgstr ""
+
+#: nova/console/vmrc_manager.py:116
+#, python-format
+msgid "Removing console %(console_id)s."
+msgstr ""
+
+#: nova/console/websocketproxy.py:54
+msgid "Invalid Token"
+msgstr ""
+
+#: nova/console/websocketproxy.py:73
+msgid "Invalid Connection Info"
+msgstr ""
+
+#: nova/console/xvp.py:100
+msgid "Rebuilding xvp conf"
+msgstr ""
+
+#: nova/console/xvp.py:119
+#, python-format
+msgid "Re-wrote %s"
+msgstr ""
+
+#: nova/console/xvp.py:124
+msgid "Failed to write configuration file"
+msgstr ""
+
+#: nova/console/xvp.py:127
+msgid "Stopping xvp"
+msgstr ""
+
+#: nova/console/xvp.py:140
+msgid "Starting xvp"
+msgstr ""
+
+#: nova/console/xvp.py:147
+#, python-format
+msgid "Error starting xvp: %s"
+msgstr ""
+
+#: nova/console/xvp.py:150
+msgid "Restarting xvp"
+msgstr ""
+
+#: nova/console/xvp.py:152
+msgid "xvp not running..."
+msgstr ""
+
+#: nova/console/xvp.py:203
+msgid "Failed to run xvp."
+msgstr ""
+
+#: nova/consoleauth/manager.py:89
+#, python-format
+msgid "Received Token: %(token)s, %(token_dict)s)"
+msgstr ""
+
+#: nova/consoleauth/manager.py:113
+#, python-format
+msgid "Checking Token: %(token)s, %(token_valid)s)"
+msgstr ""
+
+#: nova/db/api.py:592
+msgid "Failed to notify cells of instance destroy"
+msgstr ""
+
+#: nova/db/api.py:674 nova/db/api.py:695
+msgid "Failed to notify cells of instance update"
+msgstr ""
+
+#: nova/db/api.py:1453
+msgid "Failed to notify cells of bw_usage update"
+msgstr ""
+
+#: nova/db/api.py:1588
+msgid "Failed to notify cells of instance fault"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:160
+#, python-format
+msgid "Deadlock detected when running '%(func_name)s': Retrying..."
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:195
+msgid "model or base_model parameter should be subclass of NovaBase"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:1411
+#, python-format
+msgid ""
+"Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
+"empty, \"global\" or \"project\""
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:1549
+#, python-format
+msgid "Invalid instance id %s in request"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:2908
+#, python-format
+msgid "Change will make usage less than 0 for the following resources: %(unders)s"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:4416
+#, python-format
+msgid ""
+"Volume(%s) has lower stats then what is in the database. Instance must "
+"have been rebooted or crashed. Updating totals."
+msgstr ""
+
+#: nova/db/sqlalchemy/migration.py:69
+#: nova/virt/baremetal/db/sqlalchemy/migration.py:66
+msgid "version should be an integer"
+msgstr ""
+
+#: nova/db/sqlalchemy/migration.py:96
+#: nova/virt/baremetal/db/sqlalchemy/migration.py:94
+msgid "Upgrade DB using Essex release first."
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:63
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:69
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:171
+#, python-format
+msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:205
+#, python-format
+msgid "Missing column %(table)s.%(column)s in shadow table"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:211
+#, python-format
+msgid ""
+"Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
+"%(shadow_c_type)s"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:220
+#, python-format
+msgid "Extra column %(table)%.%(column)s in shadow table"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:241
+msgid "Specify `table_name` or `table` param"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:244
+msgid "Specify only one param `table_name` `table`"
+msgstr ""
+
+#: nova/db/sqlalchemy/utils.py:265
+#: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
+#: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
+msgid "Exception while creating table."
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:62
+msgid "Exception while seeding instance_types table"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/145_add_volume_usage_cache.py:68
+msgid "volume_usage_cache table not dropped"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:77
+#, python-format
+msgid "table '%s' not dropped"
+msgstr ""
+
+#: nova/image/glance.py:187
+#, python-format
+msgid ""
+"Error contacting glance server '%(host)s:%(port)s' for '%(method)s', "
+"%(extra)s."
+msgstr ""
+
+#: nova/image/glance.py:495
+#, python-format
+msgid "fetching image %s from glance"
+msgstr ""
+
+#: nova/image/s3.py:335
+#, python-format
+msgid "Failed to download %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:352
+#, python-format
+msgid "Failed to decrypt %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:362
+#, python-format
+msgid "Failed to untar %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:372
+#, python-format
+msgid "Failed to upload %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:396
+#, python-format
+msgid "Failed to decrypt private key: %s"
+msgstr ""
+
+#: nova/image/s3.py:403
+#, python-format
+msgid "Failed to decrypt initialization vector: %s"
+msgstr ""
+
+#: nova/image/s3.py:414
+#, python-format
+msgid "Failed to decrypt image file %(image_file)s: %(err)s"
+msgstr ""
+
+#: nova/image/s3.py:426
+msgid "Unsafe filenames in image"
+msgstr ""
+
+#: nova/ipv6/account_identifier.py:38 nova/ipv6/rfc2462.py:34
+#, python-format
+msgid "Bad mac for to_global_ipv6: %s"
+msgstr ""
+
+#: nova/ipv6/account_identifier.py:40 nova/ipv6/rfc2462.py:36
+#, python-format
+msgid "Bad prefix for to_global_ipv6: %s"
+msgstr ""
+
+#: nova/ipv6/account_identifier.py:42
+#, python-format
+msgid "Bad project_id for to_global_ipv6: %s"
+msgstr ""
+
+#: nova/network/api.py:56
+msgid "instance is a required argument to use @refresh_cache"
+msgstr ""
+
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
+msgid "Failed storing info cache"
+msgstr ""
+
+#: nova/network/api.py:248
+#, python-format
+msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
+msgstr ""
+
+#: nova/network/driver.py:40
+msgid "Network driver option required, but not specified"
+msgstr ""
+
+#: nova/network/driver.py:43
+#, python-format
+msgid "Loading network driver '%s'"
+msgstr ""
+
+#: nova/network/floating_ips.py:88
+#, python-format
+msgid "Fixed ip %(fixed_ip_id)s not found"
+msgstr ""
+
+#: nova/network/floating_ips.py:98 nova/network/floating_ips.py:374
+#, python-format
+msgid "Interface %(interface)s not found"
+msgstr ""
+
+#: nova/network/floating_ips.py:122
+#, python-format
+msgid "floating IP allocation for instance |%(floating_address)s|"
+msgstr ""
+
+#: nova/network/floating_ips.py:179
+msgid "Floating IP is not associated. Ignore."
+msgstr ""
+
+#: nova/network/floating_ips.py:197
+#, python-format
+msgid "Address |%(address)s| is not allocated"
+msgstr ""
+
+#: nova/network/floating_ips.py:201
+#, python-format
+msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
+msgstr ""
+
+#: nova/network/floating_ips.py:221
+#, python-format
+msgid "Quota exceeded for %(pid)s, tried to allocate floating IP"
+msgstr ""
+
+#: nova/network/floating_ips.py:282
+msgid "Failed to update usages deallocating floating IP"
+msgstr ""
+
+#: nova/network/floating_ips.py:532
+#, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/floating_ips.py:539
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr ""
+
+#: nova/network/floating_ips.py:574
+#, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/floating_ips.py:582
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr ""
+
+#: nova/network/floating_ips.py:630
+#, python-format
+msgid ""
+"Database inconsistency: DNS domain |%s| is registered in the Nova db but "
+"not visible to either the floating or instance DNS driver. It will be "
+"ignored."
+msgstr ""
+
+#: nova/network/floating_ips.py:670
+#, python-format
+msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
+msgstr ""
+
+#: nova/network/floating_ips.py:679
+#, python-format
+msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
+msgstr ""
+
+#: nova/network/ldapdns.py:100
+#, python-format
+msgid ""
+"Found multiple matches for domain %(domain)s.\n"
+"%(entry)s"
+msgstr ""
+
+#: nova/network/ldapdns.py:127
+#, python-format
+msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
+msgstr ""
+
+#: nova/network/ldapdns.py:322
+msgid "This driver only supports type 'a' entries."
+msgstr ""
+
+#: nova/network/ldapdns.py:365
+msgid "This shouldn't be getting called except during testing."
+msgstr ""
+
+#: nova/network/linux_net.py:219
+#, python-format
+msgid "Attempted to remove chain %s which does not exist"
+msgstr ""
+
+#: nova/network/linux_net.py:254
+#, python-format
+msgid "Unknown chain: %r"
+msgstr ""
+
+#: nova/network/linux_net.py:279
+#, python-format
+msgid ""
+"Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
+"%(top)r"
+msgstr ""
+
+#: nova/network/linux_net.py:424
+msgid "IPTablesManager.apply completed with success"
+msgstr ""
+
+#: nova/network/linux_net.py:680
+#, python-format
+msgid "arping error for ip %s"
+msgstr ""
+
+#: nova/network/linux_net.py:730
+#, python-format
+msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
+msgstr ""
+
+#: nova/network/linux_net.py:778
+#, python-format
+msgid "Error deleting conntrack entries for %s"
+msgstr ""
+
+#: nova/network/linux_net.py:977
+#, python-format
+msgid "Pid %d is stale, skip killing dnsmasq"
+msgstr ""
+
+#: nova/network/linux_net.py:1022
+#, python-format
+msgid "Hupping dnsmasq threw %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1024
+#, python-format
+msgid "Pid %d is stale, relaunching dnsmasq"
+msgstr ""
+
+#: nova/network/linux_net.py:1104
+#, python-format
+msgid "killing radvd threw %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1106
+#, python-format
+msgid "Pid %d is stale, relaunching radvd"
+msgstr ""
+
+#: nova/network/linux_net.py:1282
+#, python-format
+msgid "Net device removed: '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1285
+#, python-format
+msgid "Failed removing net device: '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1403
+#, python-format
+msgid "Starting VLAN interface %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1449
+#, python-format
+msgid "Starting Bridge %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1461
+#, python-format
+msgid "Adding interface %(interface)s to bridge %(bridge)s"
+msgstr ""
+
+#: nova/network/linux_net.py:1497
+#, python-format
+msgid "Failed to add interface: %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1734
+#, python-format
+msgid "Starting bridge %s "
+msgstr ""
+
+#: nova/network/linux_net.py:1742
+#, python-format
+msgid "Done starting bridge %s"
+msgstr ""
+
+#: nova/network/manager.py:364
+#, python-format
+msgid "Disassociated %s stale fixed ip(s)"
+msgstr ""
+
+#: nova/network/manager.py:368
+msgid "setting network host"
+msgstr ""
+
+#: nova/network/manager.py:480
+msgid "network allocations"
+msgstr ""
+
+#: nova/network/manager.py:487
+#, python-format
+msgid "networks retrieved for instance: |%(networks_list)s|"
+msgstr ""
+
+#: nova/network/manager.py:535
+msgid "network deallocation for instance"
+msgstr ""
+
+#: nova/network/manager.py:801
+#, python-format
+msgid ""
+"instance-dns-zone is |%(domain)s|, which is in availability zone "
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
+msgstr ""
+
+#: nova/network/manager.py:827
+#, python-format
+msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
+msgstr ""
+
+#: nova/network/manager.py:879
+msgid "Failed to update usages deallocating fixed IP"
+msgstr ""
+
+#: nova/network/manager.py:911
+#, python-format
+msgid "Unable to release %s because vif doesn't exist."
+msgstr ""
+
+#: nova/network/manager.py:934
+#, python-format
+msgid "Leased IP |%(address)s|"
+msgstr ""
+
+#: nova/network/manager.py:938
+#, python-format
+msgid "IP %s leased that is not associated"
+msgstr ""
+
+#: nova/network/manager.py:947
+#, python-format
+msgid "IP |%s| leased that isn't allocated"
+msgstr ""
+
+#: nova/network/manager.py:952
+#, python-format
+msgid "Released IP |%(address)s|"
+msgstr ""
+
+#: nova/network/manager.py:956
+#, python-format
+msgid "IP %s released that is not associated"
+msgstr ""
+
+#: nova/network/manager.py:960
+#, python-format
+msgid "IP %s released that was not leased"
+msgstr ""
+
+#: nova/network/manager.py:979
+#, python-format
+msgid "%s must be an integer"
+msgstr ""
+
+#: nova/network/manager.py:1003
+msgid "Maximum allowed length for 'label' is 255."
+msgstr ""
+
+#: nova/network/manager.py:1023
+#, python-format
+msgid ""
+"Subnet(s) too large, defaulting to /%s.  To override, specify "
+"network_size flag."
+msgstr ""
+
+#: nova/network/manager.py:1105
+msgid "cidr already in use"
+msgstr ""
+
+#: nova/network/manager.py:1108
+#, python-format
+msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
+msgstr ""
+
+#: nova/network/manager.py:1119
+#, python-format
+msgid ""
+"requested cidr (%(cidr)s) conflicts with existing smaller cidr "
+"(%(smaller)s)"
+msgstr ""
+
+#: nova/network/manager.py:1176
+msgid "Network already exists!"
+msgstr ""
+
+#: nova/network/manager.py:1195
+#, python-format
+msgid "Network must be disassociated from project %s before delete"
+msgstr ""
+
+#: nova/network/manager.py:1795
+msgid ""
+"The sum between the number of networks and the vlan start cannot be "
+"greater than 4094"
+msgstr ""
+
+#: nova/network/manager.py:1802
+#, python-format
+msgid ""
+"The network range is not big enough to fit %(num_networks)s networks. "
+"Network size is %(network_size)s"
+msgstr ""
+
+#: nova/network/minidns.py:48
+#, python-format
+msgid "minidns file is |%s|"
+msgstr ""
+
+#: nova/network/minidns.py:75 nova/network/minidns.py:106
+msgid "Invalid name"
+msgstr ""
+
+#: nova/network/minidns.py:78
+msgid "This driver only supports type 'a'"
+msgstr ""
+
+#: nova/network/minidns.py:122
+#, python-format
+msgid "Cannot delete entry |%s|"
+msgstr ""
+
+#: nova/network/minidns.py:201
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: nova/network/minidns.py:207
+#, python-format
+msgid "Cannot delete domain |%s|"
+msgstr ""
+
+#: nova/network/model.py:379
+msgid "v4 subnets are required for legacy nw_info"
+msgstr ""
+
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:152
+#, python-format
+msgid "allocate_for_instance() for %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:155
+#, python-format
+msgid "empty project id for instance %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:201
+#, python-format
+msgid ""
+"Multiple security groups found matching '%s'. Use an ID to be more "
+"specific."
+msgstr ""
+
+#: nova/network/quantumv2/api.py:270
+msgid "Port not found"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:278
+#, python-format
+msgid "Fail to delete port %(portid)s with failure: %(exception)s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:318
+#, python-format
+msgid "deallocate_for_instance() for %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:327
+#, python-format
+msgid "Failed to delete quantum port %(portid)s "
+msgstr ""
+
+#: nova/network/quantumv2/api.py:349
+#, python-format
+msgid "Failed to delete quantum port %(port_id)s "
+msgstr ""
+
+#: nova/network/quantumv2/api.py:373
+#, python-format
+msgid "get_instance_nw_info() for %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:405
+#, python-format
+msgid ""
+"Unable to update port %(portid)s on subnet %(subnet_id)s with failure: "
+"%(exception)s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:435
+#, python-format
+msgid "Unable to update port %(portid)s with failure: %(exception)s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:445
+#, python-format
+msgid "validate_networks() for %s"
+msgstr ""
+
+#: nova/network/quantumv2/api.py:688
+#, python-format
+msgid "Multiple floating IP pools matches found for name '%s'"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:53
+#, python-format
+msgid "Quantum Error creating security group %s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:106
+#, python-format
+msgid "Quantum security group %s not found"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
+#, python-format
+msgid "Quantum Error: %s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:129
+msgid "Quantum Error getting security groups"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:139
+msgid "Security group id should be uuid"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:173
+#, python-format
+msgid "Quantum Error getting security group %s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
+msgid "Quantum Error:"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:230
+#, python-format
+msgid "Quantum Error unable to delete %s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:241
+#, python-format
+msgid "Quantum security group rule %s not found"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:358
+#, python-format
+msgid ""
+"Cannot add security group %(name)s to %(instance)s since the port "
+"%(port_id)s does not meet security requirements"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
+#, python-format
+msgid "Adding security group %(security_group_id)s to port %(port_id)s"
+msgstr ""
+
+#: nova/network/security_group/quantum_driver.py:428
+#, python-format
+msgid ""
+"Security group %(security_group_name)s not assocaited with the instance "
+"%(instance)s"
+msgstr ""
+
+#: nova/network/security_group/security_group_base.py:137
+#, python-format
+msgid "This rule already exists in group %s"
+msgstr ""
+
+#: nova/openstack/common/excutils.py:48
+#, python-format
+msgid "Original exception being dropped: %s"
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:102
+#, python-format
+msgid "Could not release the acquired lock `%s`"
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:188
+#, python-format
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:199
+#, python-format
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:226
+#, python-format
+msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
+msgstr ""
+
+#: nova/openstack/common/lockutils.py:234
+#, python-format
+msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
+msgstr ""
+
+#: nova/openstack/common/log.py:244
+#, python-format
+msgid "Deprecated: %s"
+msgstr ""
+
+#: nova/openstack/common/log.py:336
+#, python-format
+msgid "Error loading logging config %(log_config)s: %(err_msg)s"
+msgstr ""
+
+#: nova/openstack/common/log.py:386
+#, python-format
+msgid "syslog facility must be one of: %s"
+msgstr ""
+
+#: nova/openstack/common/log.py:555
+#, python-format
+msgid "Fatal call to deprecated config: %(msg)s"
+msgstr ""
+
+#: nova/openstack/common/loopingcall.py:84
+#, python-format
+msgid "task run outlasted interval by %s sec"
+msgstr ""
+
+#: nova/openstack/common/loopingcall.py:91
+msgid "in fixed duration looping call"
+msgstr ""
+
+#: nova/openstack/common/loopingcall.py:131
+#, python-format
+msgid "Dynamic looping call sleeping for %.02f seconds"
+msgstr ""
+
+#: nova/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:41
+#, python-format
+msgid "Unexpected argument for periodic task creation: %(arg)s."
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:132
+#, python-format
+msgid "Skipping periodic task %(task)s because its interval is negative"
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:137
+#, python-format
+msgid "Skipping periodic task %(task)s because it is disabled"
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:175
+#, python-format
+msgid "Running periodic task %(full_task_name)s"
+msgstr ""
+
+#: nova/openstack/common/periodic_task.py:183
+#, python-format
+msgid "Error during %(full_task_name)s: %(e)s"
+msgstr ""
+
+#: nova/openstack/common/policy.py:394
+#, python-format
+msgid "Failed to understand rule %(rule)s"
+msgstr ""
+
+#: nova/openstack/common/policy.py:404
+#, python-format
+msgid "No handler for matches of kind %s"
+msgstr ""
+
+#: nova/openstack/common/policy.py:679
+#, python-format
+msgid "Failed to understand rule %(rule)r"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+msgid "Full set of CONF:"
+msgstr ""
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/session.py:461
+msgid "DB exception wrapped."
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/session.py:512
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/session.py:584
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
+#: nova/openstack/common/notifier/api.py:125
+#, python-format
+msgid "%s not in valid priorities"
+msgstr ""
+
+#: nova/openstack/common/notifier/api.py:141
+#, python-format
+msgid ""
+"Problem '%(e)s' attempting to send to notification system. "
+"Payload=%(payload)s"
+msgstr ""
+
+#: nova/openstack/common/notifier/api.py:171
+#, python-format
+msgid "Failed to load notifier %s. These notifications will not be sent."
+msgstr ""
+
+#: nova/openstack/common/notifier/rabbit_notifier.py:27
+msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
+msgstr ""
+
+#: nova/openstack/common/notifier/rpc_notifier.py:45
+#: nova/openstack/common/notifier/rpc_notifier2.py:51
+#, python-format
+msgid "Could not send notification to %(topic)s. Payload=%(message)s"
+msgstr ""
+
+#: nova/openstack/common/plugin/pluginmanager.py:66
+#, python-format
+msgid "Failed to load plugin %(plug)s: %(exc)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/__init__.py:106
+#, python-format
+msgid ""
+"A RPC is being made while holding a lock. The locks currently held are "
+"%(locks)s. This is probably a bug. Please report it. Include the "
+"following: [%(stack)s]."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:75
+msgid "Pool creating new connection"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:200
+#, python-format
+msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:208
+#, python-format
+msgid ""
+"Number of call waiters is greater than warning threshhold: %d. There "
+"could be a MulticallProxyWaiter leak."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:291
+#, python-format
+msgid "unpacked context: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:337
+#, python-format
+msgid "UNIQUE_ID is %s."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:406
+#, python-format
+msgid "received %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:414
+#, python-format
+msgid "no method for message: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:415
+#, python-format
+msgid "No method for message: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:443
+#: nova/openstack/common/rpc/impl_zmq.py:286
+#, python-format
+msgid "Expected exception during message handling (%s)"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:292
+msgid "Exception during message handling"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:586
+#, python-format
+msgid "Making synchronous call on %s ..."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:589
+#, python-format
+msgid "MSG_ID is %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:623
+#, python-format
+msgid "Making asynchronous cast on %s..."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:632
+msgid "Making asynchronous fanout cast..."
+msgstr ""
+
+#: nova/openstack/common/rpc/amqp.py:660
+#, python-format
+msgid "Sending %(event_type)s on %(topic)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:75
+msgid "An unknown RPC related exception occurred."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:105
+#, python-format
+msgid ""
+"Remote error: %(exc_type)s %(value)s\n"
+"%(traceback)s."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:122
+#, python-format
+msgid ""
+"Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
+" \"%(method)s\" info: \"%(info)s\""
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:138
+#: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
+msgid "<unknown>"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:144
+#, python-format
+msgid "Found duplicate message(%(msg_id)s). Skipping it."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:148
+msgid "Invalid reuse of an RPC connection."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:152
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:157
+#, python-format
+msgid ""
+"Specified RPC envelope version, %(version)s, not supported by this "
+"endpoint."
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
+#, python-format
+msgid "Failed to sanitize %(item)s. Key error %(err)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:307
+#, python-format
+msgid "Returning exception %s to caller"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:169
+#: nova/openstack/common/rpc/impl_qpid.py:133
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:480
+#, python-format
+msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:502
+#, python-format
+msgid "Connected to AMQP server on %(hostname)s:%(port)d"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:539
+#, python-format
+msgid ""
+"Unable to connect to AMQP server on %(hostname)s:%(port)d after "
+"%(max_retries)d tries: %(err_str)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:555
+#, python-format
+msgid ""
+"AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
+"again in %(sleep_time)d seconds."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:609
+#: nova/openstack/common/rpc/impl_qpid.py:404
+#, python-format
+msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:627
+#: nova/openstack/common/rpc/impl_qpid.py:419
+#, python-format
+msgid "Timed out waiting for RPC response: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:631
+#: nova/openstack/common/rpc/impl_qpid.py:423
+#, python-format
+msgid "Failed to consume message from queue: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_kombu.py:670
+#: nova/openstack/common/rpc/impl_qpid.py:458
+#, python-format
+msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_qpid.py:352
+#, python-format
+msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_qpid.py:358
+#, python-format
+msgid "Connected to AMQP server on %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_qpid.py:371
+msgid "Re-established AMQP queues"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_qpid.py:431
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:97
+msgid "JSON serialization failed."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:104
+#, python-format
+msgid "Deserializing: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:140
+#, python-format
+msgid "Connecting to %(addr)s with %(type)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:141
+#, python-format
+msgid "-> Subscribed to %(subscribe)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:142
+#, python-format
+msgid "-> bind: %(bind)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:150
+msgid "Could not open socket."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:162
+#, python-format
+msgid "Subscribing to %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:204
+msgid "You cannot recv on this socket."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:209
+msgid "You cannot send on this socket."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:273
+#, python-format
+msgid "Running func with context: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:311
+msgid "Sending reply"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:345
+msgid "RPC message did not include method."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:380
+msgid "Registering reactor"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:392
+msgid "In reactor registered"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:407
+msgid "Out reactor registered"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:411
+msgid "Consuming socket"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:453
+#, python-format
+msgid "CONSUMER GOT %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:465
+#, python-format
+msgid "Creating proxy for topic: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:471
+msgid "Topic contained dangerous characters."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:496
+#, python-format
+msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:505
+msgid "Topic socket file creation failed."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:510
+#, python-format
+msgid "ROUTER RELAY-OUT QUEUED %(data)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:513
+#, python-format
+msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:532
+#, python-format
+msgid "Could not create IPC directory %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:542
+msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:576
+#, python-format
+msgid "CONSUMER RECEIVED DATA: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:578
+#, python-format
+msgid "ROUTER RELAY-OUT %(data)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:600
+msgid "ZMQ Envelope version unsupported or unknown."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:628
+msgid "Skipping topic registration. Already registered."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:635
+#, python-format
+msgid "Consumer is a zmq.%s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:687
+msgid "Creating payload"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:700
+msgid "Creating queue socket for reply waiter"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:713
+msgid "Sending cast"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:716
+msgid "Cast sent; Waiting reply"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:719
+#, python-format
+msgid "Received message: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:720
+msgid "Unpacking response"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:729
+msgid "Unsupported or unknown ZMQ envelope returned."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:736
+msgid "RPC Message Invalid."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:760
+#, python-format
+msgid "%(msg)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:763
+#, python-format
+msgid "Sending message(s) to: %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:767
+msgid "No matchmaker results. Not casting."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:770
+msgid "No match from matchmaker."
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:53
+msgid "Match not found by MatchMaker."
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:89
+msgid "Matchmaker does not implement registration or heartbeat."
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:239
+#, python-format
+msgid "Matchmaker unregistered: %s, %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:250
+msgid "Register before starting heartbeat."
+msgstr ""
+
+#: nova/openstack/common/rpc/matchmaker.py:343
+#: nova/openstack/common/rpc/matchmaker.py:361
+#, python-format
+msgid "No key defining hosts for topic '%s', see ringfile"
+msgstr ""
+
+#: nova/scheduler/chance.py:51
+msgid "Is the appropriate service running?"
+msgstr ""
+
+#: nova/scheduler/chance.py:56
+msgid "Could not find another compute"
+msgstr ""
+
+#: nova/scheduler/driver.py:61
+msgid "Exception during scheduler.run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#, python-format
+msgid "Setting instance to %(state)s state."
+msgstr ""
+
+#: nova/scheduler/driver.py:156
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:164
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:169
+msgid "Driver must implement select_hosts"
+msgstr ""
+
+#: nova/scheduler/driver.py:339
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:73
+#, python-format
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:239
+msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:256
+#, python-format
+msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:288
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:356
+#, python-format
+msgid "Filtered %(hosts)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:361
+#, python-format
+msgid "Weighed %(hosts)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:403
+#, python-format
+msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:308
+#, python-format
+msgid "Host filter ignoring hosts: %s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:320
+#, python-format
+msgid "Host filter forcing available hosts to %s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:323
+#, python-format
+msgid "No hosts matched due to not matching 'force_hosts' value of '%s'"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:336
+#, python-format
+msgid "Host filter forcing available nodes to %s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:339
+#, python-format
+msgid "No nodes matched due to not matching 'force_nodes' value of '%s'"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:379
+#, python-format
+msgid "Ignoring %(service_name)s service update from %(host)s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:384
+#, python-format
+msgid "Received %(service_name)s service update from %(state_key)s."
+msgstr ""
+
+#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/filters/trusted_filter.py:214
+#, python-format
+msgid "No service for compute ID %s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:425
+#, python-format
+msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
+msgstr ""
+
+#: nova/scheduler/manager.py:208
+#, python-format
+msgid "Failed to schedule_%(method)s: %(ex)s"
+msgstr ""
+
+#: nova/scheduler/scheduler_options.py:71
+#, python-format
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgstr ""
+
+#: nova/scheduler/scheduler_options.py:79
+#, python-format
+msgid "Could not decode scheduler options: '%(e)s'"
+msgstr ""
+
+#: nova/scheduler/filters/affinity_filter.py:95
+#, python-format
+msgid "Group affinity: %(host)s in %(configured)s"
+msgstr ""
+
+#: nova/scheduler/filters/aggregate_instance_extra_specs.py:49
+#: nova/scheduler/filters/aggregate_instance_extra_specs.py:56
+#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#, python-format
+msgid "%(host_state)s fails instance_type extra_specs requirements"
+msgstr ""
+
+#: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
+#, python-format
+msgid "%(host_state)s fails tenant id on aggregate"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:40
+#, python-format
+msgid "%(host_state)s is disabled or has not been heard from in a while"
+msgstr ""
+
+#: nova/scheduler/filters/compute_filter.py:44
+#, python-format
+msgid "%(host_state)s is disabled via capabilities"
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:44
+msgid "VCPUs not set; assuming CPU collection broken"
+msgstr ""
+
+#: nova/scheduler/filters/disk_filter.py:47
+#, python-format
+msgid ""
+"%(host_state)s does not have %(requested_disk)s MB usable disk, it only "
+"has %(usable_disk_mb)s MB usable disk."
+msgstr ""
+
+#: nova/scheduler/filters/image_props_filter.py:48
+#, python-format
+msgid ""
+"Instance contains properties %(image_props)s, but no corresponding "
+"capabilities are advertised by the compute node"
+msgstr ""
+
+#: nova/scheduler/filters/image_props_filter.py:61
+#, python-format
+msgid ""
+"Instance properties %(image_props)s are satisfied by compute host "
+"capabilities %(capabilities)s"
+msgstr ""
+
+#: nova/scheduler/filters/image_props_filter.py:66
+#, python-format
+msgid ""
+"Instance contains properties %(image_props)s that are not provided by the"
+" compute node capabilities %(capabilities)s"
+msgstr ""
+
+#: nova/scheduler/filters/image_props_filter.py:82
+#, python-format
+msgid "%(host_state)s does not support requested instance_properties"
+msgstr ""
+
+#: nova/scheduler/filters/io_ops_filter.py:42
+#, python-format
+msgid ""
+"%(host_state)s fails I/O ops check: Max IOs per host is set to "
+"%(max_io_ops)s"
+msgstr ""
+
+#: nova/scheduler/filters/num_instances_filter.py:39
+#, python-format
+msgid ""
+"%(host_state)s fails num_instances check: Max instances per host is set "
+"to %(max_instances)s"
+msgstr ""
+
+#: nova/scheduler/filters/ram_filter.py:46
+#, python-format
+msgid ""
+"%(host_state)s does not have %(requested_ram)s MB usable ram, it only has"
+" %(usable_ram)s MB usable ram."
+msgstr ""
+
+#: nova/scheduler/filters/retry_filter.py:41
+#, python-format
+msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
+msgstr ""
+
+#: nova/servicegroup/api.py:60
+#, python-format
+msgid "ServiceGroup driver defined as an instance of %s"
+msgstr ""
+
+#: nova/servicegroup/api.py:66
+#, python-format
+msgid "unknown ServiceGroup driver name: %s"
+msgstr ""
+
+#: nova/servicegroup/api.py:83
+#, python-format
+msgid ""
+"Join new ServiceGroup member %(member_id)s to the %(group_id)s group, "
+"service = %(service)s"
+msgstr ""
+
+#: nova/servicegroup/api.py:90
+#, python-format
+msgid "Check if the given member [%s] is part of the ServiceGroup, is up"
+msgstr ""
+
+#: nova/servicegroup/api.py:99
+#, python-format
+msgid ""
+"Explicitly remove the given member %(member_id)s from the%(group_id)s "
+"group monitoring"
+msgstr ""
+
+#: nova/servicegroup/api.py:106
+#, python-format
+msgid "Returns ALL members of the [%s] ServiceGroup"
+msgstr ""
+
+#: nova/servicegroup/api.py:114
+#, python-format
+msgid "Returns one member of the [%s] group"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:41
+#, python-format
+msgid ""
+"DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
+" group, service = %(service)s"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:45
+msgid "service is a mandatory argument for DB based ServiceGroup driver"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:72
+#, python-format
+msgid "DB_Driver: get_all members of the %s group"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
+msgid "Recovered model server connection!"
+msgstr ""
+
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
+msgid "model server went away"
+msgstr ""
+
+#: nova/servicegroup/drivers/mc.py:43
+msgid "memcached_servers not defined"
+msgstr ""
+
+#: nova/servicegroup/drivers/mc.py:51
+#, python-format
+msgid ""
+"Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
+"%(group_id)s group, service = %(service)s"
+msgstr ""
+
+#: nova/servicegroup/drivers/mc.py:56
+msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
+msgstr ""
+
+#: nova/servicegroup/drivers/mc.py:74
+#, python-format
+msgid "Memcached_Driver: get_all members of the %s group"
+msgstr ""
+
+#: nova/servicegroup/drivers/zk.py:80
+#, python-format
+msgid ""
+"ZooKeeperDriver: join new member %(id)s to the %(gr)s group, "
+"service=%(sr)s"
+msgstr ""
+
+#: nova/servicegroup/drivers/zk.py:90
+msgid ""
+"Unable to join. It is possible that either another node exists with the "
+"same name, or this node just restarted. We will try again in a short "
+"while to make sure."
+msgstr ""
+
+#: nova/servicegroup/drivers/zk.py:101
+#, python-format
+msgid "ZooKeeperDriver.leave: %(member)s from group %(group)s"
+msgstr ""
+
+#: nova/servicegroup/drivers/zk.py:109
+#, python-format
+msgid "ZooKeeperDriver.leave: %(id)s has not joined to the %(gr)s group"
+msgstr ""
+
+#: nova/storage/linuxscsi.py:71
+#, python-format
+msgid "Trying (%(tries)s) to remove device %(device)s"
+msgstr ""
+
+#: nova/storage/linuxscsi.py:101
+#, python-format
+msgid "Multipath call failed exit (%(code)s)"
+msgstr ""
+
+#: nova/storage/linuxscsi.py:119
+#, python-format
+msgid "Couldn't find multipath device %(line)s"
+msgstr ""
+
+#: nova/storage/linuxscsi.py:123
+#, python-format
+msgid "Found multipath device = %(mdev)s"
+msgstr ""
+
+#: nova/tests/fake_ldap.py:34
+msgid "Attempted to instantiate singleton"
+msgstr ""
+
+#: nova/tests/fake_processutils.py:71
+#, python-format
+msgid "Faking execution of cmd (subprocess): %s"
+msgstr ""
+
+#: nova/tests/fake_processutils.py:79
+#, python-format
+msgid "Faked command matched %s"
+msgstr ""
+
+#: nova/tests/fake_processutils.py:95
+#, python-format
+msgid "Faked command raised an exception %s"
+msgstr ""
+
+#: nova/tests/fake_processutils.py:100
+#, python-format
+msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
+msgstr ""
+
+#: nova/tests/fake_volume.py:188
+msgid "status must be available"
+msgstr ""
+
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
+msgid "already attached"
+msgstr ""
+
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
+msgid "Instance and volume not in same availability_zone"
+msgstr ""
+
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
+msgid "already detached"
+msgstr ""
+
+#: nova/tests/test_hypervapi.py:433
+msgid "fake vswitch not found"
+msgstr ""
+
+#: nova/tests/test_misc.py:59
+#, python-format
+msgid ""
+"The following migrations are missing a downgrade:\n"
+"\t%s"
+msgstr ""
+
+#: nova/tests/test_xenapi.py:897
+#, python-format
+msgid "Creating files in %s to simulate guest agent"
+msgstr ""
+
+#: nova/tests/test_xenapi.py:908
+#, python-format
+msgid "Removing simulated guest agent files in %s"
+msgstr ""
+
+#: nova/tests/api/test_auth.py:79
+msgid "200 Role Match"
+msgstr ""
+
+#: nova/tests/api/test_auth.py:81
+msgid "200 No Roles"
+msgstr ""
+
+#: nova/tests/api/test_auth.py:84
+msgid "unexpected role header"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/test_servers.py:3365
+msgid ""
+"Quota exceeded for instances: Requested 1, but already used 10 of 10 "
+"instances"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/test_servers.py:3370
+msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/test_servers.py:3375
+msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:1099
+#: nova/tests/compute/test_compute.py:1117
+#: nova/tests/compute/test_compute.py:1168
+#: nova/tests/compute/test_compute.py:1195
+#: nova/tests/compute/test_compute.py:1241
+#: nova/tests/compute/test_compute.py:3804
+#, python-format
+msgid "Running instances: %s"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:1105
+#: nova/tests/compute/test_compute.py:1140
+#: nova/tests/compute/test_compute.py:1183
+#: nova/tests/compute/test_compute.py:1213
+#, python-format
+msgid "After terminating instances: %s"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:1723
+msgid "Internal error"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:3815
+#, python-format
+msgid "After force-killing instances: %s"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:4315
+msgid "wrong host/node"
+msgstr ""
+
+#: nova/tests/compute/test_compute.py:8904
+msgid "spawn error"
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:177
+#, python-format
+msgid "%(result_str)s: %(result)s is not a dict."
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:191
+#, python-format
+msgid ""
+"Dictionary key mismatch:\n"
+"Extra key(s) in template:\n"
+"%(ex_delta)s\n"
+"Extra key(s) in %(result_str)s:\n"
+"%(res_delta)s\n"
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:202
+#, python-format
+msgid "%(result_str)s: %(result)s is not a list."
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:221
+msgid "Extra list items in template:"
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:225
+#, python-format
+msgid "Extra list items in %(result_str)s:"
+msgstr ""
+
+#: nova/tests/integrated/test_api_samples.py:246
+#: nova/tests/integrated/test_api_samples.py:261
+#, python-format
+msgid ""
+"Values do not match:\n"
+"Template: %(expected)s\n"
+"%(result_str)s: %(result)s"
+msgstr ""
+
+#: nova/tests/integrated/test_login.py:31
+#, python-format
+msgid "flavor: %s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:38
+#, python-format
+msgid ""
+"%(message)s\n"
+"Status Code: %(_status)s\n"
+"Body: %(_body)s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:47
+msgid "Authentication error"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:55
+msgid "Authorization error"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:63
+msgid "Item not found"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:105
+#, python-format
+msgid "Doing %(method)s on %(relative_url)s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:107
+#, python-format
+msgid "Body: %s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:125
+#, python-format
+msgid "%(auth_uri)s => code %(http_status)s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:155
+#, python-format
+msgid "%(relative_uri)s => code %(http_status)s"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:165
+msgid "Unexpected status code"
+msgstr ""
+
+#: nova/tests/integrated/api/client.py:172
+#, python-format
+msgid "Decoding JSON: %s"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
+#: nova/virt/configdrive.py:97
+#, python-format
+msgid "Added %(filepath)s to config drive"
+msgstr ""
+
+#: nova/virt/driver.py:924
+msgid "Event must be an instance of nova.virt.event.Event"
+msgstr ""
+
+#: nova/virt/driver.py:930
+#, python-format
+msgid "Exception dispatching event %(event)s: %(ex)s"
+msgstr ""
+
+#: nova/virt/driver.py:952
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/virt/driver.py:955
+#, python-format
+msgid "Loading compute driver '%s'"
+msgstr ""
+
+#: nova/virt/driver.py:962
+msgid "Unable to load the virtualization driver"
+msgstr ""
+
+#: nova/virt/fake.py:212
+#, python-format
+msgid "Key '%(key)s' not in instances '%(inst)s'"
+msgstr ""
+
+#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+msgid "Attempted to unfilter instance which is not filtered"
+msgstr ""
+
+#: nova/virt/firewall.py:195
+msgid "Filters added to instance"
+msgstr ""
+
+#: nova/virt/firewall.py:197
+msgid "Provider Firewall Rules refreshed"
+msgstr ""
+
+#: nova/virt/firewall.py:377
+#, python-format
+msgid "Adding security group rule: %r"
+msgstr ""
+
+#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#, python-format
+msgid "Adding provider rule: %s"
+msgstr ""
+
+#: nova/virt/images.py:113
+msgid "Snapshot list encountered but no header found!"
+msgstr ""
+
+#: nova/virt/images.py:215
+msgid "'qemu-img info' parsing failed."
+msgstr ""
+
+#: nova/virt/images.py:221
+#, python-format
+msgid "fmt=%(fmt)s backed by: %(backing_file)s"
+msgstr ""
+
+#: nova/virt/images.py:233
+#, python-format
+msgid "Converted to raw, but format is now %s"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:90
+#, python-format
+msgid "Request for baremetal node %s sent to wrong service host"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:143
+msgid "cpu_arch is not found in instance_type_extra_specs"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:185
+#, python-format
+msgid "Baremetal node id not supplied to driver for %r"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:257
+#, python-format
+msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:284
+#, python-format
+msgid "Baremetal power manager failed to restart node for instance %r"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:295
+#, python-format
+msgid "Destroy called on non-existing instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:313
+#, python-format
+msgid "Error from baremetal driver during destroy: %s"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:318
+#, python-format
+msgid "Error while recording destroy failure in baremetal database: %s"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:328
+#, python-format
+msgid "Baremetal power manager failed to stop node for instance %r"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:340
+#, python-format
+msgid "Baremetal power manager failed to start node for instance %r"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:86
+#, python-format
+msgid "pid file %s does not contain any pid"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:109
+msgid "Node id not supplied to IPMI"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:112
+msgid "Address not supplied to IPMI"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:115
+msgid "User not supplied to IPMI"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:118
+msgid "Password not supplied to IPMI"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:135
+#, python-format
+msgid "ipmitool stdout: '%(out)s', stderr: '%(err)s'"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:157
+msgid "IPMI power on failed"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:179
+msgid "IPMI power off failed"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:189
+msgid "IPMI set next bootdev failed"
+msgstr ""
+
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
+#, python-format
+msgid "Activate node called, but node %s is already active"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:92
+#, python-format
+msgid "Building PXE config for deployment %s."
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:231
+#, python-format
+msgid ""
+"Can not activate PXE bootloader. The following boot parameters were not "
+"passed to baremetal driver: %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:179
+#, python-format
+msgid "Fetching kernel and ramdisk for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:210
+#, python-format
+msgid "Fetching image %(ami)s for instance %(name)s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:246
+#, python-format
+msgid "Injecting files into image for instance %(name)s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:365
+#, python-format
+msgid "Node associated with another instance while waiting for deploy of %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:466
+#, python-format
+msgid "PXE deploy started for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:471
+#, python-format
+msgid "PXE deploy completed for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:475
+#, python-format
+msgid "PXE deploy failed for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:390
+#, python-format
+msgid "Baremetal node deleted while waiting for deployment of instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/pxe.py:482
+#, python-format
+msgid "Timeout reached while waiting for PXE deploy of instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:154
+#, python-format
+msgid ""
+"Can not activate Tilera bootloader. The following boot parameters were "
+"not passed to baremetal driver: %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:371
+#, python-format
+msgid "Tilera deploy started for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:377
+#, python-format
+msgid "Tilera deploy completed for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:385
+msgid "Node is unknown error state."
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:388
+#, python-format
+msgid "Tilera deploy failed for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:83
+msgid "Node id not supplied to PDU"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:86
+msgid "Address not supplied to PDU"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:89
+msgid "User not supplied to PDU"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:92
+msgid "Password not supplied to PDU"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:117
+msgid "PDU failed"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:134
+msgid "PDU power on failed"
+msgstr ""
+
+#: nova/virt/baremetal/tilera_pdu.py:147
+msgid "PDU power off failed"
+msgstr ""
+
+#: nova/virt/baremetal/utils.py:41
+#, python-format
+msgid "Failed to inject data into image %(image)s. Error: %(e)s"
+msgstr ""
+
+#: nova/virt/baremetal/utils.py:52
+#, python-format
+msgid "Failed to unlink %(path)s, error: %(e)s"
+msgstr ""
+
+#: nova/virt/baremetal/utils.py:60
+#, python-format
+msgid "Failed to remove dir %(path)s, error: %(e)s"
+msgstr ""
+
+#: nova/virt/baremetal/utils.py:75
+#, python-format
+msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:37
+#, python-format
+msgid "plug: instance_uuid=%(uuid)s vif=%(vif)s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:50
+#, python-format
+msgid "pif:%(id)s is plugged (vif_uuid=%(vif_uuid)s)"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:57
+#, python-format
+msgid ""
+"Baremetal node: %(id)s has no available physical interface for virtual "
+"interface %(vif_uuid)s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:63
+#, python-format
+msgid "unplug: instance_uuid=%(uuid)s vif=%(vif)s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:71
+#, python-format
+msgid "pif:%(id)s is unplugged (vif_uuid=%(vif_uuid)s)"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:75
+#, python-format
+msgid "no pif for vif_uuid=%s"
+msgstr ""
+
+#: nova/virt/baremetal/virtual_power_driver.py:111
+msgid "virtual_power_ssh_host not defined. Can not Start"
+msgstr ""
+
+#: nova/virt/baremetal/virtual_power_driver.py:115
+msgid "virtual_power_host_user not defined. Can not Start"
+msgstr ""
+
+#: nova/virt/baremetal/virtual_power_driver.py:121
+msgid "virtual_power_host_pass/key not set. Can not Start"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:122
+#, python-format
+msgid "baremetal driver was unable to delete tid %s"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:186
+#, python-format
+msgid "Could not determine iscsi initiator name for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:227
+#, python-format
+msgid "No fixed PXE IP is associated to %s"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:259
+#, python-format
+msgid "detach volume could not find tid for %s"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:199
+msgid "instance_uuid must be supplied to bm_node_associate_and_update"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:211
+#, python-format
+msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:329
+msgid "No more PXE IPs available"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:351
+#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#, python-format
+msgid "Baremetal interface %s not found"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#, python-format
+msgid "Baremetal interface %s already in use"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#, python-format
+msgid "Baremetal virtual interface %s not found"
+msgstr ""
+
+#: nova/virt/disk/api.py:133
+#, python-format
+msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:140
+#, python-format
+msgid "Cannot resize filesystem %s to a smaller size."
+msgstr ""
+
+#: nova/virt/disk/api.py:151
+#, python-format
+msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
+msgstr ""
+
+#: nova/virt/disk/api.py:161
+#, python-format
+msgid ""
+"Unable to determine label for image %(image)s with error %(errror)s. "
+"Cannot resize."
+msgstr ""
+
+#: nova/virt/disk/api.py:228
+msgid "image already mounted"
+msgstr ""
+
+#: nova/virt/disk/api.py:284
+#, python-format
+msgid ""
+"Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:302
+#, python-format
+msgid "Ignoring error injecting data into image (%(e)s)"
+msgstr ""
+
+#: nova/virt/disk/api.py:321
+#, python-format
+msgid ""
+"Failed to mount container filesystem '%(image)s' on '%(target)s': "
+"%(errors)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:338
+#, python-format
+msgid "Failed to teardown ntainer filesystem: %s"
+msgstr ""
+
+#: nova/virt/disk/api.py:351
+#, python-format
+msgid "Failed to umount container filesystem: %s"
+msgstr ""
+
+#: nova/virt/disk/api.py:376
+#, python-format
+msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
+msgstr ""
+
+#: nova/virt/disk/api.py:388
+#, python-format
+msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:397
+#, python-format
+msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:438
+#, python-format
+msgid "Inject key fs=%(fs)s key=%(key)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:466
+#, python-format
+msgid "Inject key fs=%(fs)s net=%(net)s"
+msgstr ""
+
+#: nova/virt/disk/api.py:491
+#, python-format
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
+msgstr ""
+
+#: nova/virt/disk/api.py:535
+msgid "Not implemented on Windows"
+msgstr ""
+
+#: nova/virt/disk/api.py:564
+#, python-format
+msgid "User %(username)s not found in password file."
+msgstr ""
+
+#: nova/virt/disk/api.py:580
+#, python-format
+msgid "User %(username)s not found in shadow file."
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:41
+#, python-format
+msgid ""
+"Instance for format imgfile=%(imgfile)s mountdir=%(mountdir)s "
+"partition=%(partition)s imgfmt=%(imgfmt)s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
+#: nova/virt/disk/vfs/localfs.py:67
+msgid "Using LoopMount"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
+#: nova/virt/disk/vfs/localfs.py:72
+msgid "Using NbdMount"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:57
+#, python-format
+msgid ""
+"Instance for device imgfile=%(imgfile)s mountdir=%(mountdir)s "
+"partition=%(partition)s device=%(device)s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:117
+msgid "Device allocation failed. Will retry in 2 seconds."
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:120
+msgid "Device allocation failed after repeated retries."
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:135
+#, python-format
+msgid "Map dev %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:140
+#, python-format
+msgid "partition search unsupported with %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:156
+#, python-format
+msgid "partition %s not found"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:157
+#, python-format
+msgid "Failed to map partitions: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:179
+#, python-format
+msgid "Unmap dev %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:187
+#, python-format
+msgid "Mount %(dev)s on %(dir)s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:192
+#, python-format
+msgid "Failed to mount filesystem: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:203
+#, python-format
+msgid "Umount %s"
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:214
+msgid "Fail to mount, tearing back down"
+msgstr ""
+
+#: nova/virt/disk/mount/loop.py:33
+#, python-format
+msgid "Could not attach image to loopback: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/loop.py:34
+#, python-format
+msgid "Loop mount error: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/loop.py:40
+#, python-format
+msgid "Got loop device %s"
+msgstr ""
+
+#: nova/virt/disk/mount/loop.py:58
+#, python-format
+msgid "Release loop device %s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:55 nova/virt/disk/mount/nbd.py:69
+msgid "No free nbd devices"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:60
+msgid "nbd module not loaded"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:61
+msgid "nbd unavailable: module not loaded"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:86
+#, python-format
+msgid "Get nbd device %(dev)s for %(imgfile)s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:91
+#, python-format
+msgid "qemu-nbd error: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:92 nova/virt/disk/mount/nbd.py:105
+#, python-format
+msgid "NBD mount error: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:104
+#, python-format
+msgid "nbd device %s did not show up"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:111
+#, python-format
+msgid "Detaching from erroneous nbd device returned error: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/nbd.py:126
+#, python-format
+msgid "Release nbd device %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/api.py:27
+#, python-format
+msgid ""
+"Instance for image imgfile=%(imgfile)s imgfmt=%(imgfmt)s "
+"partition=%(partition)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/api.py:32
+msgid "Trying to import guestfs"
+msgstr ""
+
+#: nova/virt/disk/vfs/api.py:39
+msgid "Using primary VFSGuestFS"
+msgstr ""
+
+#: nova/virt/disk/vfs/api.py:44
+msgid "Falling back to VFSLocalFS"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:55
+#, python-format
+msgid "Mount guest OS image %(imgfile)s partition %(part)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:64
+#, python-format
+msgid "Inspecting guest OS image %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:68
+#, python-format
+msgid "No operating system found in %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:72
+#, python-format
+msgid "Multi-boot OS %(roots)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:74
+#, python-format
+msgid "Multi-boot operating system found in %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:80
+#, python-format
+msgid "Inspecting guest OS root filesystem %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:85
+#, python-format
+msgid "No mount points found in %(root)s of %(imgfile)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:90
+#, python-format
+msgid "Mounting %(dev)s at %(dir)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:95
+#, python-format
+msgid "Setting up appliance for %(imgfile)s %(imgfmt)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:113
+#, python-format
+msgid "Error mounting %(imgfile)s with libguestfs (%(e)s)"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:120
+msgid "Tearing down appliance"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:126
+#, python-format
+msgid "Failed to close augeas %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:134
+#, python-format
+msgid "Failed to shutdown appliance %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:142
+#, python-format
+msgid "Failed to close guest handle %s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:154 nova/virt/disk/vfs/localfs.py:102
+#, python-format
+msgid "Make directory path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:159 nova/virt/disk/vfs/localfs.py:107
+#, python-format
+msgid "Append file path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:164 nova/virt/disk/vfs/localfs.py:116
+#, python-format
+msgid "Replace file path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:169 nova/virt/disk/vfs/localfs.py:125
+#, python-format
+msgid "Read file path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:174 nova/virt/disk/vfs/localfs.py:131
+#, python-format
+msgid "Has file path=%(path)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:183
+#, python-format
+msgid "Set permissions path=%(path)s mode=%(mode)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:188
+#, python-format
+msgid "Set ownership path=%(path)s user=%(user)s group=%(group)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/guestfs.py:201
+#, python-format
+msgid "chown uid=%(uid)d gid=%(gid)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:46
+#, python-format
+msgid "File path %s not valid"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:80
+#, python-format
+msgid "Failed to mount image %(ex)s)"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:90
+#, python-format
+msgid "Failed to unmount %(imgdir)s: %(ex)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:96
+#, python-format
+msgid "Failed to remove %(imgdir)s: %(ex)s"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:139
+#, python-format
+msgid "Set permissions path=%(path)s mode=%(mode)o"
+msgstr ""
+
+#: nova/virt/disk/vfs/localfs.py:144
+#, python-format
+msgid "Set permissions path=%(path)s user=%(user)s group=%(group)s"
+msgstr ""
+
+#: nova/virt/hyperv/basevolumeutils.py:71
+msgid "The ISCSI initiator name can't be found. Choosing the default one"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:150
+msgid "plug_vifs called"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:153
+msgid "unplug_vifs called"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:156
+msgid "ensure_filtering_rules_for_instance called"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:160
+msgid "unfilter_instance called"
+msgstr ""
+
+#: nova/virt/hyperv/driver.py:191
+msgid "get_console_output called"
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:93
+#, python-format
+msgid "Windows version: %s "
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:105
+msgid "get_available_resource called"
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
+#: nova/virt/xenapi/host.py:148
+msgid "Updating host stats"
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:159
+msgid "get_host_stats called"
+msgstr ""
+
+#: nova/virt/hyperv/hostops.py:174
+#, python-format
+msgid "Host IP address is: %s"
+msgstr ""
+
+#: nova/virt/hyperv/imagecache.py:49
+#, python-format
+msgid "The image is not a valid VHD: %s"
+msgstr ""
+
+#: nova/virt/hyperv/imagecache.py:69
+#, python-format
+msgid ""
+"Cannot resize the image to a size smaller than the VHD max. internal "
+"size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
+msgstr ""
+
+#: nova/virt/hyperv/imagecache.py:84
+#, python-format
+msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/imagecache.py:87
+#, python-format
+msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:45
+msgid "live_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:55
+#, python-format
+msgid "Calling live migration recover_method for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:59
+#, python-format
+msgid "Calling live migration post_method for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:65
+msgid "pre_live_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:78
+msgid "post_live_migration_at_destination called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:85
+msgid "check_can_live_migrate_destination called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:90
+msgid "check_can_live_migrate_destination_cleanup called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:94
+msgid "check_can_live_migrate_source called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:43
+#, python-format
+msgid "Live migration is not supported on target host \"%s\""
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:46
+#, python-format
+msgid "Target live migration host \"%s\" is unreachable"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:49
+#, python-format
+msgid "Live migration failed: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:61
+msgid "Live migration is not enabled on this host"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:64
+msgid "Live migration networks are not configured on this host"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:70 nova/virt/hyperv/vmutils.py:103
+#, python-format
+msgid "VM not found: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:72 nova/virt/hyperv/vmutils.py:112
+#, python-format
+msgid "Duplicate VM name found: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:77
+#, python-format
+msgid "Destroying existing remote planned VM: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:99
+#, python-format
+msgid "Creating remote planned VM for VM: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:156
+#, python-format
+msgid ""
+"Replacing host resource %(old_disk_path)s with %(new_disk_path)s on "
+"planned VM %(vm_name)s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:163
+#, python-format
+msgid "Updating remote planned VM disk paths for VM: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:199
+#, python-format
+msgid "Starting live migration for VM: %s"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationutils.py:208
+#, python-format
+msgid "Getting live migration networks for remote host: %s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:50
+msgid "Migration target is the source host"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:52
+#, python-format
+msgid "Migration target host: %s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:73
+#, python-format
+msgid "Copying disk \"%(disk_file)s\" to \"%(dest_path)s\""
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:96
+msgid "Cannot cleanup migration files"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:103
+#, python-format
+msgid ""
+"Cannot resize the root disk to a smaller size. Current size: "
+"%(curr_root_gb)s GB. Requested size: %(new_root_gb)s GB"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:113
+msgid "migrate_disk_and_power_off called"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:133
+msgid "confirm_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:148
+msgid "finish_revert_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:166
+#, python-format
+msgid "Copying base disk %(base_vhd_path)s to %(base_vhd_copy_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:170
+#, python-format
+msgid ""
+"Reconnecting copied base VHD %(base_vhd_copy_path)s and diff VHD "
+"%(diff_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:176
+#, python-format
+msgid "Merging base disk %(base_vhd_copy_path)s and diff disk %(diff_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:188
+#, python-format
+msgid "Getting info for disk: %s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:193
+#, python-format
+msgid "Resizing disk \"%(vhd_path)s\" to new max size %(new_size)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:204
+#, python-format
+msgid ""
+"Reconnecting copied base VHD %(base_vhd_path)s and diff VHD "
+"%(diff_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:213
+msgid "finish_migration called"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:222
+#, python-format
+msgid "Cannot find boot VHD file: %s"
+msgstr ""
+
+#: nova/virt/hyperv/migrationops.py:235 nova/virt/hyperv/vmops.py:136
+msgid "Cannot resize a VHD to a smaller size"
+msgstr ""
+
+#: nova/virt/hyperv/networkutils.py:46
+#, python-format
+msgid "vswitch \"%s\" not found"
+msgstr ""
+
+#: nova/virt/hyperv/networkutils.py:59
+#, python-format
+msgid "Failed to create vswitch port %(port_name)s on switch %(vswitch_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/pathutils.py:71
+#, python-format
+msgid "The file copy from %(src)s to %(dest)s failed"
+msgstr ""
+
+#: nova/virt/hyperv/pathutils.py:92
+#, python-format
+msgid "Creating directory: %s"
+msgstr ""
+
+#: nova/virt/hyperv/pathutils.py:97 nova/virt/hyperv/snapshotops.py:116
+#, python-format
+msgid "Removing directory: %s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:56
+#, python-format
+msgid "Creating snapshot for instance %s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:65
+#, python-format
+msgid "Getting info for VHD %s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:73
+#, python-format
+msgid "Copying VHD %(src_vhd_path)s to %(dest_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:83
+#, python-format
+msgid "Copying base disk %(src_vhd_path)s to %(dest_base_disk_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:88
+#, python-format
+msgid ""
+"Reconnecting copied base VHD %(dest_base_disk_path)s and diff VHD "
+"%(dest_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:94
+#, python-format
+msgid "Merging base disk %(dest_base_disk_path)s and diff disk %(dest_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:99
+#, python-format
+msgid ""
+"Updating Glance image %(image_id)s with content from merged disk "
+"%(image_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:105
+#, python-format
+msgid "Snapshot image %(image_id)s updated for VM %(instance_name)s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:109
+#, python-format
+msgid "Removing snapshot %s"
+msgstr ""
+
+#: nova/virt/hyperv/snapshotops.py:113
+#, python-format
+msgid "Failed to remove snapshot for VM %s"
+msgstr ""
+
+#: nova/virt/hyperv/vif.py:75
+#, python-format
+msgid "Creating vswitch port for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:91
+#, python-format
+msgid "VIF driver not found for network_api_class: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:100
+msgid "get_info called for instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:121
+#, python-format
+msgid ""
+"Creating differencing VHD. Parent: %(base_vhd_path)s, Target: "
+"%(root_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:127
+#, python-format
+msgid "Copying VHD image %(base_vhd_path)s to target: %(root_vhd_path)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:139
+#, python-format
+msgid "Resizing VHD %(root_vhd_path)s to new size %(root_vhd_size)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:152
+msgid "Spawning new instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:178
+msgid "Spawn instance failed"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:203
+#, python-format
+msgid "Creating nic for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:211
+#, python-format
+msgid "Invalid config_drive_format \"%s\""
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:214
+#, python-format
+msgid "Using config drive for instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
+#, python-format
+msgid "Creating config drive at %(path)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
+#, python-format
+msgid "Creating config drive failed with error: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:271
+#, python-format
+msgid "Got request to destroy instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:284
+#, python-format
+msgid "Instance not found: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:290
+#, python-format
+msgid "Failed to destroy instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:295
+msgid "reboot instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:301
+msgid "Pause instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:307
+msgid "Unpause instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:313
+msgid "Suspend instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:319
+msgid "Resume instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:325
+msgid "Power off instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:331
+msgid "Power on instance"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:338
+#, python-format
+msgid "Successfully changed state of VM %(vm_name)s to: %(req_state)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmops.py:342
+#, python-format
+msgid "Failed to change vm state of %(vm_name)s to %(req_state)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:83
+#, python-format
+msgid "Cannot get VM summary data for: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:160
+#, python-format
+msgid "Creating VM %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:169
+#, python-format
+msgid "Setting memory for vm %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:172
+#, python-format
+msgid "Set vCPUs for vm %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:270
+msgid "Controller not found"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:332
+#, python-format
+msgid "Successfully changed vm state of %(vm_name)s to %(req_state)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:373
+#, python-format
+msgid "Operation failed with return value: %s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:391
+#, python-format
+msgid ""
+"WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
+" - %(err_desc)s - Error code: %(err_code)d"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:399
+#, python-format
+msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:403
+#, python-format
+msgid "WMI job failed with status %(job_state)d. No error description available"
+msgstr ""
+
+#: nova/virt/hyperv/vmutils.py:409
+#, python-format
+msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:98
+#, python-format
+msgid ""
+"Already logged in on storage target. No need to login. Portal: "
+"%(target_portal)s, IQN: %(target_iqn)s, LUN: %(target_lun)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:102
+#, python-format
+msgid ""
+"Logging in on storage target. Portal: %(target_portal)s, IQN: "
+"%(target_iqn)s, LUN: %(target_lun)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:115
+#, python-format
+msgid "Attach_volume: %(connection_info)s to %(instance_name)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:145
+#, python-format
+msgid "Attach volume failed: %s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:147
+#, python-format
+msgid "Unable to attach volume to instance %s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:160
+#, python-format
+msgid "Logging off storage target %(target_iqn)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:165
+#, python-format
+msgid "Detach_volume: %(connection_info)s from %(instance_name)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:176
+#, python-format
+msgid "Detaching physical disk from instance: %s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
+msgid "Could not determine iscsi initiator name"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:198 nova/virt/hyperv/volumeops.py:211
+#, python-format
+msgid "Unable to find a mounted disk for target_iqn: %s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeops.py:200
+#, python-format
+msgid "Device number: %(device_number)s, target lun: %(target_lun)s"
+msgstr ""
+
+#: nova/virt/hyperv/volumeutils.py:51
+#, python-format
+msgid "An error has occurred when calling the iscsi initiator: %s"
+msgstr ""
+
+#: nova/virt/libvirt/blockinfo.py:127
+#, python-format
+msgid "Unable to determine disk prefix for %s"
+msgstr ""
+
+#: nova/virt/libvirt/blockinfo.py:174
+#, python-format
+msgid "No free disk device names for prefix '%s'"
+msgstr ""
+
+#: nova/virt/libvirt/blockinfo.py:264
+#, python-format
+msgid "Unable to determine disk bus for '%s'"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:346
+#, python-format
+msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:552
+#, python-format
+msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:560
+#, python-format
+msgid "Connecting to libvirt: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:577
+#, python-format
+msgid "URI %s does not support events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:593
+msgid "Connection to libvirt broke"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:615 nova/virt/libvirt/driver.py:618
+#, python-format
+msgid "Can not handle authentication request for %d credentials"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:636
+#, python-format
+msgid "Connection to libvirt failed: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:728
+#, python-format
+msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:743
+msgid "During wait destroy, instance disappeared."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:748
+msgid "Instance destroyed successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:758
+msgid "Instance may be started again."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:768
+msgid "Going to destroy instance again."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:787
+msgid "Error from libvirt during undefineFlags. Retrying with undefine"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:803
+#, python-format
+msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:823
+msgid "Instance may be still running, destroy it again."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:829
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:857
+#, python-format
+msgid "Deleting instance files %(target)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:866
+#, python-format
+msgid "Failed to cleanup directory %(target)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:909
+msgid "Could not determine fibre channel world wide node names"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:916
+msgid "Could not determine fibre channel world wide port names"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:921
+msgid "No Volume Connector found."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1043
+msgid "During detach_volume, instance disappeared."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1067
+msgid "attaching network adapter failed."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1087
+msgid "During detach_interface, instance disappeared."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1091
+msgid "detaching network adapter failed."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1177
+msgid "Beginning live snapshot process"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1180
+msgid "Beginning cold snapshot process"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1209
+msgid "Snapshot extracted, beginning image upload"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1221
+msgid "Snapshot image upload complete"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1294
+msgid "Instance soft rebooted successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1298
+msgid "Failed to soft reboot instance."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1333
+msgid "Instance shutdown successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1341
+msgid "Instance may have been rebooted during soft reboot, so return now."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1389
+msgid "Instance rebooted successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1535
+msgid "Instance is running"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
+msgid "Instance spawned successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1558
+#, python-format
+msgid "data: %(data)r, fpath: %(fpath)r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
+#, python-format
+msgid "Truncated console log returned, %d bytes ignored"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1610
+msgid "Guest does not have a console available"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1679
+#, python-format
+msgid "Path '%(path)s' supports direct I/O"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1683
+#, python-format
+msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
+#, python-format
+msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1764
+msgid "Creating image"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1865
+msgid "Using config drive"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1914
+#, python-format
+msgid "Injecting %(inj)s into image %(img_id)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1924
+#, python-format
+msgid "Error injecting data into image %(img_id)s (%(e)s)"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1981
+#, python-format
+msgid ""
+"Config requested an explicit CPU model, but the current libvirt "
+"hypervisor '%s' does not support selecting CPU models"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1987
+msgid "Config requested a custom CPU model, but no model name was provided"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1991
+msgid "A CPU model name should not be set when a host CPU model is requested"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1995
+#, python-format
+msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2011
+msgid ""
+"Passthrough of the host CPU was requested but this libvirt version does "
+"not support this feature"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2335
+#, python-format
+msgid ""
+"Start to_xml instance=%(instance)s network_info=%(network_info)s "
+"disk_info=%(disk_info)s image_meta=%(image_meta)s "
+"rescue=%(rescue)sblock_device_info=%(block_device_info)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2350
+#, python-format
+msgid "End to_xml instance=%(instance)s xml=%(xml)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2367
+#, python-format
+msgid ""
+"Error from libvirt while looking up %(instance_name)s: [Error Code "
+"%(error_code)s] %(ex)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
+#, python-format
+msgid "Invalid range expression %r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2558
+#, python-format
+msgid "Invalid exclusion expression %r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2565
+#, python-format
+msgid "Invalid inclusion expression %r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2570
+#, python-format
+msgid "No CPUs available after parsing %r"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2587
+msgid ""
+"Cannot get the number of cpu, because this function is not implemented "
+"for this platform. "
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2597
+msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2649
+#, python-format
+msgid "couldn't obtain the vpu count from domain id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2655
+#, python-format
+msgid "List of domains returned by libVirt: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2657
+#, python-format
+msgid "libVirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2721
+msgid "libvirt version is too old (does not support getVersion)"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2805
+#, python-format
+msgid "Trying to get stats for the volume %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2818
+#, python-format
+msgid ""
+"Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
+"rd_req=%(rd_req)d, rd_bytes=%(rd_bytes)d, wr_req=%(wr_req)d, "
+"wr_bytes=%(wr_bytes)d"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2836
+#, python-format
+msgid ""
+"Getting block stats failed, device might have been detached. "
+"Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2841
+#, python-format
+msgid ""
+"Could not find domain in libvirt for instance %s. Cannot get block stats "
+"for device"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2918
+#, python-format
+msgid ""
+"Creating tmpfile %s to verify with other compute node that the instance "
+"is on the same shared storage."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3000
+msgid "Block migration can not be used with shared storage."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3008
+msgid "Live migration can not be used without shared storage."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3045
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s: Disk of instance is too "
+"large(available on destination host:%(available)s < need:%(necessary)s)"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3070
+#, python-format
+msgid ""
+"Instance launched has CPU info:\n"
+"%s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3082
+#, python-format
+msgid ""
+"CPU doesn't have compatibility.\n"
+"\n"
+"%(ret)s\n"
+"\n"
+"Refer to %(u)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3099
+#, python-format
+msgid ""
+"Creating tmpfile %s to notify to other compute nodes that they should "
+"mount the same storage."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3147
+#, python-format
+msgid "The firewall filter for %s does not exist"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3219
+#, python-format
+msgid "Live Migration failure: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3312
+#, python-format
+msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3424
+#, python-format
+msgid ""
+"Error from libvirt while getting description of %(instance_name)s: [Error"
+" Code %(error_code)s] %(ex)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3441
+#, python-format
+msgid "skipping %(path)s since it looks like volume"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3446
+#, python-format
+msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3487
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3556
+msgid "Starting migrate_disk_and_power_off"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3617
+msgid "Instance running successfully."
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3623
+msgid "Starting finish_migration"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3685
+msgid "Starting finish_revert_migration"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:3806
+#, python-format
+msgid "Checking instance files accessability%(instance_path)s"
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:51
+msgid ""
+"Libvirt module could not be loaded. NWFilterFirewall will not work "
+"correctly."
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:107
+msgid "Called setup_basic_filtering in nwfilter"
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:115
+msgid "Ensuring static filters"
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:247
+#, python-format
+msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:270
+#, python-format
+msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:286
+msgid "iptables firewall: Setup Basic Filtering"
+msgstr ""
+
+#: nova/virt/libvirt/imagebackend.py:294
+msgid "You should specify libvirt_images_volume_group flag to use LVM images."
+msgstr ""
+
+#: nova/virt/libvirt/imagebackend.py:378
+#, python-format
+msgid "Unknown image_type=%s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:139
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:178
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:200
+#, python-format
+msgid "Writing stored info to %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:329
+#, python-format
+msgid "%s is a valid instance name"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:332
+#, python-format
+msgid "%s has a disk file"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:334
+#, python-format
+msgid "Instance %(instance)s is backed by %(backing)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:347
+#, python-format
+msgid ""
+"Instance %(instance)s is using a backing file %(backing)s which does not "
+"appear in the image service"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:422
+#, python-format
+msgid "image %(id)s at (%(base_file)s): image verification failed"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:432
+#, python-format
+msgid ""
+"image %(id)s at (%(base_file)s): image verification skipped, no hash "
+"stored"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:441
+#, python-format
+msgid "%(id)s (%(base_file)s): generating checksum"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:456
+#, python-format
+msgid "Cannot remove %(base_file)s, it does not exist"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:468
+#, python-format
+msgid "Base file too young to remove: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:471
+#, python-format
+msgid "Removing base file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:478
+#, python-format
+msgid "Failed to remove %(base_file)s, error was %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:489
+#, python-format
+msgid "image %(id)s at (%(base_file)s): checking"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:513
+#, python-format
+msgid ""
+"image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
+"%(remote)d on other nodes sharing this instance storage"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:525
+#, python-format
+msgid ""
+"image %(id)s at (%(base_file)s): warning -- an absent base file is in "
+"use! instances: %(instance_list)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:537
+#, python-format
+msgid "image %(id)s at (%(base_file)s): image is not in use"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:544
+#, python-format
+msgid "image %(id)s at (%(base_file)s): image is in use"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:568
+#, python-format
+msgid "Skipping verification, no base directory at %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:572
+msgid "Verify base images"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:579
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:597
+#, python-format
+msgid "Unknown base file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:602
+#, python-format
+msgid "Active base files: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:605
+#, python-format
+msgid "Corrupt base files: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:609
+#, python-format
+msgid "Removable base files: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:617
+msgid "Verification complete"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:72 nova/virt/libvirt/utils.py:78
+msgid "systool is not installed"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:82
+msgid "Cannot find any Fibre Channel HBAs"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:224
+#, python-format
+msgid ""
+"Insufficient Space on Volume Group %(vg)s. Only %(free_space)db "
+"available, but %(size)db required by volume %(lv)s."
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:233
+#, python-format
+msgid ""
+"Volume group %(vg)s will not be able to hold sparse volume %(lv)s. "
+"Virtual volume size is %(size)db, but free space on volume group is only "
+"%(free_space)db."
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:264
+#, python-format
+msgid "vg %s must be LVM volume group"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:293
+#, python-format
+msgid "Path %s must be LVM logical volume"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:558
+msgid "Can't retrieve root device path from instance libvirt configuration"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
+#: nova/virt/libvirt/vif.py:473
+#, python-format
+msgid ""
+"vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
+"mapping=%(mapping)s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
+#: nova/virt/libvirt/vif.py:479
+msgid "vif_type parameter must be present for this vif_driver implementation"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
+#: nova/virt/libvirt/vif.py:492
+#, python-format
+msgid "Unexpected vif_type=%s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:304
+#, python-format
+msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:314
+#, python-format
+msgid "Ensuring bridge %s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+msgid "Failed while unplugging vif"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:501
+msgid ""
+"The LibvirtBridgeDriver VIF driver is now deprecated and will be removed "
+"in the next release. Please use the LibvirtGenericVIFDriver VIF driver, "
+"together with a network plugin that reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:527
+msgid ""
+"The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:555
+msgid ""
+"The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
+" removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:583
+msgid ""
+"The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
+"will be removed in the next release. Please use the "
+"LibvirtGenericVIFDriver VIF driver, together with a network plugin that "
+"reports the 'vif_type' attribute"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:609
+msgid ""
+"The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
+"removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
+"driver, together with a network plugin that reports the 'vif_type' "
+"attribute"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:238
+#, python-format
+msgid "iSCSI device not found at %s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:241
+#, python-format
+msgid ""
+"ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
+"number: %(tries)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:253
+#, python-format
+msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
+#, python-format
+msgid "%s is already mounted"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:563
+#, python-format
+msgid "AoE device not found at %s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:565
+#, python-format
+msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:579
+#, python-format
+msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:707
+msgid "We are unable to locate any Fibre Channel devices"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:716
+#, python-format
+msgid "Looking for Fibre Channel dev %(device)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:726
+msgid "Fibre Channel device not found."
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:729
+#, python-format
+msgid ""
+"Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
+"Try number: %(tries)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:745
+#, python-format
+msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:752
+#, python-format
+msgid "Multipath device discovered %(device)s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:818
+msgid "Value required for 'scality_sofs_config'"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:829
+#, python-format
+msgid "Cannot access 'scality_sofs_config': %s"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:835
+msgid "Cannot execute /sbin/mount.sofs"
+msgstr ""
+
+#: nova/virt/libvirt/volume.py:850
+msgid "Cannot mount Scality SOFS, check syslog for errors"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:149
+#, python-format
+msgid "Removing the logical volume '%s'"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:167
+#, python-format
+msgid "Fetching image '%s' from glance"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:172
+#, python-format
+msgid "Using image found at '%s'"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:174
+#, python-format
+msgid "Ensuring image '%s' exists on IVM"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:185
+#, python-format
+msgid "Creating logical volume of size %s bytes"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:188
+#, python-format
+msgid "Copying image to the device '%s'"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:191
+msgid "Error while creating logical volume from image. Will attempt cleanup."
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:198
+msgid "Error while attempting cleanup of failed deploy to logical volume."
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:244
+msgid "Snapshot added to glance."
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:250
+#, python-format
+msgid "Failed to clean up snapshot file %(snapshot_file_path)s"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:335
+msgid "Could not create logical volume. No space left on any volume group."
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:426 nova/virt/powervm/blockdev.py:498
+msgid "Unable to get checksum"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:429 nova/virt/powervm/blockdev.py:521
+msgid "Image checksums do not match"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:450
+#, python-format
+msgid "Image found on host at '%s'"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:458
+msgid "Uncompressed image file not found"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
+#, python-format
+msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
+msgstr ""
+
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
+#, python-format
+msgid "Found error stream for command \"%(command)s\": %(error_text)s"
+msgstr ""
+
+#: nova/virt/powervm/common.py:67
+msgid "Connection error connecting PowerVM manager"
+msgstr ""
+
+#: nova/virt/powervm/common.py:100
+#, python-format
+msgid "Running cmd (SSH-as-root): %s"
+msgstr ""
+
+#: nova/virt/powervm/common.py:149
+msgid "File transfer to PowerVM manager failed"
+msgstr ""
+
+#: nova/virt/powervm/common.py:168
+#, python-format
+msgid "ftp GET %(remote_path)s to: %(local_path)s"
+msgstr ""
+
+#: nova/virt/powervm/common.py:174
+msgid "File transfer from PowerVM manager failed"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:124
+msgid "In get_host_ip_addr"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:127
+#, python-format
+msgid "Attempting to resolve %s"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:129
+#, python-format
+msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:174
+#, python-format
+msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
+msgstr ""
+
+#: nova/virt/powervm/driver.py:305
+#, python-format
+msgid "Unrecognized root disk information: %s"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:21
+msgid "Connection to PowerVM manager failed"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:25
+#, python-format
+msgid "File '%(file_path)s' transfer to PowerVM manager failed"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:29
+#, python-format
+msgid "FTP %(ftp_cmd)s from %(source_path)s to %(dest_path)s failed"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:33
+#, python-format
+msgid "LPAR instance '%(instance_name)s' could not be found"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:37
+#, python-format
+msgid "LPAR instance '%(instance_name)s' creation failed"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:41
+msgid "No space left on any volume group"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:49
+#, python-format
+msgid "Operation '%(operation)s' on LPAR '%(instance_name)s' timed out"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:54
+msgid "Image creation failed on PowerVM"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:58
+#, python-format
+msgid ""
+"Insufficient free memory on PowerVM system to spawn instance "
+"'%(instance_name)s'"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:63
+#, python-format
+msgid ""
+"Insufficient available CPUs on PowerVM system to spawn instance "
+"'%(instance_name)s'"
+msgstr ""
+
+#: nova/virt/powervm/exception.py:68
+#, python-format
+msgid "PowerVM LPAR instance '%(instance_name)s' cleanup failed"
+msgstr ""
+
+#: nova/virt/powervm/lpar.py:55
+#, python-format
+msgid ""
+"Encountered unknown LPAR attribute: %s\n"
+"Continuing without storing"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:98
+#, python-format
+msgid "LPAR instance '%s' not found"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:186
+#, python-format
+msgid "PowerVM image creation failed: %s"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:200
+#, python-format
+msgid "Creating LPAR instance '%s'"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:202
+#, python-format
+msgid "LPAR instance '%s' creation failed"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:208
+#, python-format
+msgid "Activating the LPAR instance '%s'"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:225
+#, python-format
+msgid "Instance '%s' failed to boot"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:237
+msgid "Error while attempting to clean up failed instance launch."
+msgstr ""
+
+#: nova/virt/powervm/operator.py:241
+#, python-format
+msgid "Instance spawned in %s seconds"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:252
+#, python-format
+msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
+msgstr ""
+
+#: nova/virt/powervm/operator.py:271
+#, python-format
+msgid "Stopping instance %s for snapshot."
+msgstr ""
+
+#: nova/virt/powervm/operator.py:294
+#, python-format
+msgid "Shutting down the instance '%s'"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:299
+#, python-format
+msgid "Deleting the LPAR instance '%s'"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:311
+msgid "PowerVM instance cleanup failed"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
+msgid "Not enough free memory in the host"
+msgstr ""
+
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
+msgid "Insufficient available CPU on PowerVM"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:138
+msgid ""
+"Must specify vmwareapi_host_ip,vmwareapi_host_username and "
+"vmwareapi_host_password to usecompute_driver=vmwareapi.VMwareESXDriver or"
+" vmwareapi.VMwareVCDriver"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:355
+#, python-format
+msgid "VMware Cluster %s is not found"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:456
+#, python-format
+msgid "In vmwareapi:_create_session, got this exception: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:539
+#, python-format
+msgid "In vmwareapi:_call_method, got this exception: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:575
+#, python-format
+msgid "Task [%(task_name)s] %(task_ref)s status: success"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:580
+#, python-format
+msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/driver.py:584
+#, python-format
+msgid "In vmwareapi:_poll_task, Got this error %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/error_util.py:93
+#, python-format
+msgid "Error(s) %s occurred in the call to RetrieveProperties"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#, python-format
+msgid "%(text)s: _db_content => %(content)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:132
+#, python-format
+msgid "Property %(attr)s not set for the managed object %(name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:492
+msgid "There is no VM registered"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#, python-format
+msgid "Virtual Machine with ref %s is not there"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:557
+#, python-format
+msgid "Logging out a session that is invalid or already logged out: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:572
+msgid "Session is faulty"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:575
+msgid "Session Invalid"
+msgstr ""
+
+#: nova/virt/vmwareapi/fake.py:666
+msgid "No Virtual Machine has been registered yet"
+msgstr ""
+
+#: nova/virt/vmwareapi/host.py:40
+#, python-format
+msgid "%(action)s %(host)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/host.py:63
+#, python-format
+msgid "Set maintenance mod on %(host)s to %(mode)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/io_util.py:112
+#, python-format
+msgid "Glance image %s is in killed state"
+msgstr ""
+
+#: nova/virt/vmwareapi/io_util.py:120
+#, python-format
+msgid "Glance image %(image_id)s is in unknown state - %(state)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/network_util.py:138
+msgid ""
+"ESX SOAP server returned an empty port group for the host system in its "
+"response"
+msgstr ""
+
+#: nova/virt/vmwareapi/network_util.py:164
+#, python-format
+msgid "Creating Port Group with name %s on the ESX host"
+msgstr ""
+
+#: nova/virt/vmwareapi/network_util.py:178
+#, python-format
+msgid "Created Port Group with name %s on the ESX host"
+msgstr ""
+
+#: nova/virt/vmwareapi/read_write_util.py:142
+#, python-format
+msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:84
+msgid "Unable to import suds."
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:169
+#, python-format
+msgid "No such SOAP method '%s' provided by VI SDK"
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:174
+#, python-format
+msgid "httplib error in %s: "
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:181
+#, python-format
+msgid "Socket error in %s: "
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:186
+#, python-format
+msgid "Type error in  %s: "
+msgstr ""
+
+#: nova/virt/vmwareapi/vim.py:190
+#, python-format
+msgid "Exception in %s "
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:92
+msgid "Getting list of instances"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:108
+#, python-format
+msgid "Got total of %s instances"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:198
+msgid "Creating VM on the ESX host"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:206
+msgid "Created VM on the ESX host"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:230
+#, python-format
+msgid ""
+"Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
+"type %(adapter_type)s on the ESX host local store %(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:249
+#, python-format
+msgid ""
+"Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
+"%(disk_type)s on the ESX host local store %(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:258
+#, python-format
+msgid ""
+"Deleting the file %(vmdk_path)s on the ESX host localstore "
+"%(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:272
+#, python-format
+msgid ""
+"Deleted the file %(vmdk_path)s on the ESX host local store "
+"%(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:280
+#, python-format
+msgid ""
+"Downloading image file data %(image_ref)s to the ESX data store "
+"%(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:300
+#, python-format
+msgid ""
+"Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
+"ESX data store %(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:314
+#, python-format
+msgid ""
+"Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
+" %(adapter_type)s on the ESX host local store %(data_store_name)s to disk"
+" type %(disk_type)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:335
+#, python-format
+msgid ""
+"Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
+"%(disk_type)s on the ESX host local store %(data_store_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:414
+msgid "Powering on the VM instance"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:420
+msgid "Powered on the VM instance"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:466
+msgid "Creating Snapshot of the VM instance"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:476
+msgid "Created Snapshot of the VM instance"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:521
+msgid "Copying disk data before snapshot of the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:534
+msgid "Copied disk data before snapshot of the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:543
+#, python-format
+msgid "Uploading image %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:557
+#, python-format
+msgid "Uploaded image %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:570
+#, python-format
+msgid "Deleting temporary vmdk file %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:579
+#, python-format
+msgid "Deleted temporary vmdk file %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:611
+msgid "instance is not powered on"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:618
+msgid "Rebooting guest OS of VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:621
+msgid "Rebooted guest OS of VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:623
+msgid "Doing hard reboot of VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:627
+msgid "Did hard reboot of VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
+#: nova/virt/vmwareapi/vmops.py:964
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+msgid "Destroying the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+msgid "Destroyed the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:652
+#, python-format
+msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+msgid "Powering off the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+msgid "Powered off the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:699
+msgid "Unregistering the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:702
+msgid "Unregistered the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:704
+#, python-format
+msgid ""
+"In vmwareapi:vmops:destroy, got this exception while un-registering the "
+"VM: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:717
+#, python-format
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:729
+#, python-format
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:734
+#, python-format
+msgid ""
+"In vmwareapi:vmops:destroy, got this exception while deleting the VM "
+"contents from the disk: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:742
+msgid "pause not supported for vmwareapi"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:746
+msgid "unpause not supported for vmwareapi"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:760
+msgid "Suspending the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:764
+msgid "Suspended the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:767
+msgid "instance is powered off and cannot be suspended."
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:770
+msgid "VM was already in suspended state. So returning without doing anything"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:783
+msgid "Resuming the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:788
+msgid "Resumed the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:790
+msgid "instance is not in a suspended state"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:851
+msgid "instance is suspended and cannot be powered off."
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:854
+msgid "VM was already in powered off state. So returning without doing anything"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:867
+msgid "VM was already in powered on state. So returning without doing anything"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:871
+msgid "Powering on the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:876
+msgid "Powered on the VM"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:893
+#, python-format
+msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:924
+#, python-format
+msgid "Renaming the VM to %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:930
+#, python-format
+msgid "Renamed the VM to %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:945
+#, python-format
+msgid "Cloning VM to host %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:953
+#, python-format
+msgid "Cloned VM to host %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:975
+#, python-format
+msgid ""
+"In vmwareapi:vmops:confirm_migration, got this exception while destroying"
+" the VM: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:990
+#, python-format
+msgid "Renaming the VM from %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:996
+#, python-format
+msgid "Renamed the VM from %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1019
+#, python-format
+msgid "Migrating VM to host %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1031
+#, python-format
+msgid "Migrated VM to host %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
+#, python-format
+msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1045
+#, python-format
+msgid "Automatically hard rebooting %d"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1081
+msgid "get_diagnostics not implemented for vmwareapi"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1163
+msgid "Reconfiguring VM instance to set the machine id"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1169
+msgid "Reconfigured VM instance to set the machine id"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1183
+#, python-format
+msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1190
+#, python-format
+msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1283
+#, python-format
+msgid "Creating directory with path %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:1289
+#, python-format
+msgid "Created directory with path %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:91
+#, python-format
+msgid "Downloading image %s from glance image server"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:107
+#, python-format
+msgid "Downloaded image %s from glance image server"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:113
+#, python-format
+msgid "Uploading image %s to the Glance image server"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:139
+#, python-format
+msgid "Uploaded image %s to the Glance image server"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:150
+#, python-format
+msgid "Getting image size for the image %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmware_images.py:155
+#, python-format
+msgid "Got image size of %(size)s for the image %(image)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volume_util.py:163
+#, python-format
+msgid "Rescanning HBA %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volume_util.py:166
+#, python-format
+msgid "Rescanned HBA %s "
+msgstr ""
+
+#: nova/virt/vmwareapi/volume_util.py:178 nova/virt/xenapi/volume_utils.py:267
+#, python-format
+msgid "Mountpoint cannot be translated: %s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:57
+#, python-format
+msgid ""
+"Reconfiguring VM instance %(instance_name)s to attach disk %(vmdk_path)s "
+"or device %(device_name)s with type %(disk_type)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:65
+#, python-format
+msgid ""
+"Reconfigured VM instance %(instance_name)s to attach disk %(vmdk_path)s "
+"or device %(device_name)s with type %(disk_type)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:77
+#, python-format
+msgid "Reconfiguring VM instance %(instance_name)s to detach disk %(disk_key)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:84
+#, python-format
+msgid "Reconfigured VM instance %(instance_name)s to detach disk %(disk_key)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:91
+#, python-format
+msgid "Discovering iSCSI target %(target_iqn)s from %(target_portal)s."
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:96
+msgid "Storage target found. No need to discover"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:104
+#, python-format
+msgid "Discovered iSCSI target %(target_iqn)s from %(target_portal)s."
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:107
+#, python-format
+msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#, python-format
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:138 nova/virt/vmwareapi/volumeops.py:177
+msgid "Unable to find iSCSI Target"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#, python-format
+msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#, python-format
+msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:185
+msgid "Unable to find volume"
+msgstr ""
+
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#, python-format
+msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
+#, python-format
+msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
+#, python-format
+msgid ""
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
+"args=%(args)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
+#, python-format
+msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:107
+#, python-format
+msgid ""
+"The agent call to %(method)s returned an invalid response: %(ret)r. "
+"path=%(path)s; args=%(args)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:117
+#, python-format
+msgid "Failed to query agent version: %(resp)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:136
+msgid "Querying agent version"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:150
+msgid "Reached maximum time attempting to query agent version"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:158
+#, python-format
+msgid "Updating agent to %s"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:166
+#, python-format
+msgid "Failed to update agent: %(resp)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:180
+msgid "Setting admin password"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:191
+#, python-format
+msgid "Failed to exchange keys: %(resp)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:211
+#, python-format
+msgid "Failed to update password: %(resp)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:232
+msgid "Skipping setting of ssh key for Windows."
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:247
+#, python-format
+msgid "Injecting file path: %r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+#, python-format
+msgid "Failed to inject file: %(resp)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:267
+msgid "Resetting network"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:273
+#, python-format
+msgid "Failed to reset network: %(resp)r"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:296
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:304
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:308
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:360
+#, python-format
+msgid "OpenSSL error: %s"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:134
+msgid ""
+"Must specify xenapi_connection_url, xenapi_connection_username "
+"(optionally), and xenapi_connection_password to use "
+"compute_driver=xenapi.XenAPIDriver"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:161
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:345
+#, python-format
+msgid "Could not determine key: %s"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:561
+msgid "Host startup on XenServer is not supported."
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:621
+msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:661
+msgid "Host is member of a pool, but DB says otherwise"
+msgstr ""
+
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
+#, python-format
+msgid "Got exception: %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
+#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+msgid "Raising NotImplemented"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:689
+#, python-format
+msgid "xenapi.fake does not have an implementation for %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:723
+#, python-format
+msgid "Calling %(localname)s %(impl)s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:728
+#, python-format
+msgid "Calling getter %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:731
+#, python-format
+msgid "Calling setter %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:793
+#, python-format
+msgid ""
+"xenapi.fake does not have an implementation for %s or it has been called "
+"with the wrong number of arguments"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:68
+#, python-format
+msgid ""
+"Instance %(name)s running on %(host)s could not be found in the database:"
+" assuming it is a worker VM and skip ping migration to a new host"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:80
+#, python-format
+msgid "Aggregate for host %(host)s count not be found."
+msgstr ""
+
+#: nova/virt/xenapi/host.py:101
+#, python-format
+msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:185
+#, python-format
+msgid "Failed to extract instance support from %s"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:202
+msgid "Unable to get updated status"
+msgstr ""
+
+#: nova/virt/xenapi/host.py:205
+#, python-format
+msgid "The call to %(method)s returned an error: %(e)s."
+msgstr ""
+
+#: nova/virt/xenapi/network_utils.py:29
+#, python-format
+msgid "Found non-unique network for name_label %s"
+msgstr ""
+
+#: nova/virt/xenapi/network_utils.py:47
+#, python-format
+msgid "Found non-unique network for bridge %s"
+msgstr ""
+
+#: nova/virt/xenapi/network_utils.py:49
+#, python-format
+msgid "Found no network for bridge %s"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:71
+#, python-format
+msgid ""
+"Aggregate %(aggregate_id)s: unrecoverable state during operation on "
+"%(host)s"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:158
+#, python-format
+msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:175
+#, python-format
+msgid "Unable to eject %(host)s from the pool; No master found"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:192
+#, python-format
+msgid "Pool-Join failed: %(e)s"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:195
+#, python-format
+msgid "Unable to join %(host)s in the pool"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:211
+#, python-format
+msgid "Pool-eject failed: %(e)s"
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:223
+#, python-format
+msgid "Unable to set up pool: %(e)s."
+msgstr ""
+
+#: nova/virt/xenapi/pool.py:234
+#, python-format
+msgid "Pool-set_name_label failed: %(e)s"
+msgstr ""
+
+#: nova/virt/xenapi/vif.py:101
+#, python-format
+msgid "Found no PIF for device %s"
+msgstr ""
+
+#: nova/virt/xenapi/vif.py:120
+#, python-format
+msgid ""
+"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"Expected %(vlan_num)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:273
+msgid "Created VM"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:285
+msgid "VM destroyed"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
+msgid "VM already halted, skipping shutdown..."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:294
+msgid "Shutting down VM (cleanly)"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:309
+msgid "Shutting down VM (hard)"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:347
+#, python-format
+msgid "VBD not found in instance %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:364
+#, python-format
+msgid "VBD %s already detached"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:367
+#, python-format
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:372
+#, python-format
+msgid "Unable to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:377
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:388
+#, python-format
+msgid "Unable to destroy VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:410
+#, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:413
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:439
+#, python-format
+msgid "Unable to destroy VDI %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:466
+#, python-format
+msgid ""
+"Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
+" on %(sr_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:480
+msgid "SR not present and could not be introduced"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:505
+#, python-format
+msgid "block device info: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:591
+#, python-format
+msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:636
+#, python-format
+msgid "No primary VDI found for %(vm_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:649
+msgid "Starting snapshot for VM"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:699
+#, python-format
+msgid "Destroying cached VDI '%(vdi_uuid)s'"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:952
+#, python-format
+msgid ""
+"Fast cloning is only supported on default local SR of type ext. SR on "
+"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1008
+#, python-format
+msgid "Unrecognized cache_images value '%s', defaulting to True"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1042
+#, python-format
+msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1054
+#, python-format
+msgid ""
+"download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
+"params: %(params)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1067
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1102
+#, python-format
+msgid "Invalid value '%s' for xenapi_torrent_images"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1113
+#, python-format
+msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1188
+#, python-format
+msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1203
+#, python-format
+msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1207
+#, python-format
+msgid ""
+"Image size %(size_bytes)d exceeded instance_type allowed size "
+"%(allowed_size_bytes)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1229
+#, python-format
+msgid "Fetching image %(image_id)s, type %(image_type_str)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1242
+#, python-format
+msgid "Size for image %(image_id)s: %(virtual_size)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1251
+#, python-format
+msgid ""
+"Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
+"bytes"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1270
+#, python-format
+msgid "Copying VDI %s to /boot/guest on dom0"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1284
+#, python-format
+msgid "Kernel/Ramdisk VDI %s destroyed"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1293
+msgid "Failed to fetch glance image"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1334
+#, python-format
+msgid "Detected %(image_type_str)s format for image %(image_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1365
+#, python-format
+msgid "Looking up vdi %s for PV kernel"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1383
+#, python-format
+msgid ""
+"Image format is None: trying to determine PV status using pygrub; if "
+"instance with vdi %s does not boot correctly, try with image metadata."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1389
+#, python-format
+msgid "Unknown image format %(disk_image_type)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1420
+#, python-format
+msgid "VDI %s is still available"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1523
+#, python-format
+msgid "Unable to parse rrd of %(vm_uuid)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1550
+#, python-format
+msgid "Re-scanning SR %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1578
+#, python-format
+msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1596
+msgid ""
+"XenAPI is unable to find a Storage Repository to install guest instances "
+"on. Please check your configuration and/or configure the flag "
+"'sr_matching_filter'"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1609
+msgid "Cannot find SR of content-type ISO"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1617
+#, python-format
+msgid "ISO: looking at SR %(sr_rec)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1619
+msgid "ISO: not iso content"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1622
+msgid "ISO: iso content_type, no 'i18n-key' key"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1625
+msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1629
+msgid "ISO: SR MATCHing our criteria"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1631
+msgid "ISO: ISO, looking to see if it is host local"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1634
+#, python-format
+msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1637
+#, python-format
+msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1640
+msgid "ISO: SR with local PBD"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1662
+#, python-format
+msgid ""
+"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
+"%(server)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1678
+#, python-format
+msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1732
+#, python-format
+msgid "Invalid statistics data from Xenserver: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1792
+#, python-format
+msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1879
+#, python-format
+msgid ""
+"Parent %(parent_uuid)s doesn't match original parent "
+"%(original_parent_uuid)s, waiting for coalesce..."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1889
+#, python-format
+msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1924
+#, python-format
+msgid "Timeout waiting for device %s to be created"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1944
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1957
+#, python-format
+msgid "Plugging VBD %s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1960
+#, python-format
+msgid "Plugging VBD %s done."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1962
+#, python-format
+msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1965
+#, python-format
+msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1970
+#, python-format
+msgid "Destroying VBD for VDI %s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1978
+#, python-format
+msgid "Destroying VBD for VDI %s done."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2005
+#, python-format
+msgid "Running pygrub against %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2013
+#, python-format
+msgid "Found Xen kernel %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2015
+msgid "No Xen kernel found.  Booting HVM."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2017
+msgid ""
+"Error while executing pygrub! Please, ensure the binary is installed "
+"correctly, and available in your PATH; on some Linux distros, pygrub may "
+"be installed in /usr/lib/xen-X.Y/bin/pygrub. Attempting to boot in HVM "
+"mode."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2034
+msgid "Partitions:"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2040
+#, python-format
+msgid "  %(num)s: %(ptype)s %(size)d sectors"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2065
+#, python-format
+msgid ""
+"Writing partition table %(primary_first)d %(primary_last)d to "
+"%(dev_path)s..."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2078
+#, python-format
+msgid "Writing partition table %s done."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
+#, python-format
+msgid ""
+"Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
+"virtual_size=%(virtual_size)d block_size=%(block_size)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2183
+#, python-format
+msgid ""
+"Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
+"reduction in size"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2235
+msgid "Manipulating interface files directly"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2244
+#, python-format
+msgid "Failed to mount filesystem (expected for non-linux instances): %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2356
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
+#, python-format
+msgid "Updating progress to %(progress)d"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:174
+#, python-format
+msgid "Importing image upload handler: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:187
+msgid "Error: Agent is disabled"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:301
+msgid "Starting instance"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:387
+msgid "Removing kernel/ramdisk files from dom0"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:460
+#, python-format
+msgid "Block device information present: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:491
+msgid "Failed to spawn, rolling back"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:590
+msgid "Auto configuring disk, attempting to resize partition..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:636
+msgid "Starting VM"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:642
+msgid "Waiting for instance state to become running"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:656
+#, python-format
+msgid ""
+"Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
+"%(version)s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:659
+#, python-format
+msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:670
+#, python-format
+msgid "Instance agent version: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:701
+msgid "Setting VCPU weight"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:712
+#, python-format
+msgid "Could not find VM with name %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:770
+msgid "Finished snapshot and upload for VM"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:774
+#, python-format
+msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:782
+msgid "Failed to transfer vhd to new host"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:812
+msgid "Clean shutdown did not complete successfully, trying hard shutdown."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:816
+msgid "Unable to terminate instance."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:821
+msgid "Resize down not allowed without auto_disk_config"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
+#, python-format
+msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:995
+msgid "Resize complete"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1039
+msgid "Starting halted instance found during reboot"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1045
+msgid ""
+"Reboot failed due to bad volumes, detaching bad volumes and starting "
+"halted instance"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1139
+msgid "Unable to find root VBD/VDI for VM"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1143
+msgid "Destroying VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1170
+msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1177
+msgid "instance has a kernel or ramdisk but not both"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1184
+msgid "kernel/ramdisk files removed"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1211
+msgid "Destroying VM"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1240
+msgid "VM is not present, skipping destroy..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1291
+#, python-format
+msgid "Instance is already in Rescue Mode: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1325
+msgid "VM is not present, skipping soft delete..."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1378
+msgid "Automatically hard rebooting"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1518
+msgid "Injecting network info to xenstore"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1537
+msgid "Creating vifs"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1546
+#, python-format
+msgid "Creating VIF for network %(network_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1549
+#, python-format
+msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1577
+msgid "Injecting hostname to xenstore"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1675
+#, python-format
+msgid ""
+"Destination host:%(hostname)s must be in the same aggregate as the source"
+" server"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1696
+msgid "No suitable network for migrate"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1708
+msgid "Migrate Receive failed"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1782
+msgid "XAPI supporting relax-xsm-sr-check=true requried"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1793
+msgid "VM.assert_can_migrate failed"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:1846
+msgid "Migrate Send failed"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:51
+#, python-format
+msgid "Creating SR %(label)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:61
+#, python-format
+msgid "Introducing SR %(label)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:68
+msgid "Creating PBD for SR"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:71
+msgid "Plugging SR"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:82
+msgid "Forgetting SR..."
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:104
+#, python-format
+msgid "Unable to find SR from VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:121
+#, python-format
+msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:129
+#, python-format
+msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:153
+#, python-format
+msgid "Unable to introduce VDI on SR %s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:161
+#, python-format
+msgid "Unable to get record of VDI %s on"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:183
+#, python-format
+msgid "Unable to introduce VDI for SR %s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:193
+msgid "Cannot purge SR with referenced VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:202
+#, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:241
+#, python-format
+msgid "Unable to obtain target information %(connection_data)s"
+msgstr ""
+
+#: nova/virt/xenapi/volumeops.py:70
+#, python-format
+msgid "Connect_volume: %(connection_info)s"
+msgstr ""
+
+#: nova/virt/xenapi/volumeops.py:139
+#, python-format
+msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgstr ""
+
+#: nova/virt/xenapi/imageupload/glance.py:64
+#, python-format
+msgid ""
+"Asking xapi to upload to glance %(vdi_uuids)s as ID %(image_id)s glance "
+"server: %(glance_host)s:%(glance_port)d attempt "
+"%(attempt_num)d/%(max_attempts)d"
+msgstr ""
+
+#: nova/virt/xenapi/imageupload/glance.py:77
+#, python-format
+msgid "upload_vhd failed: %r"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:95 nova/vnc/xvp_proxy.py:100
+#, python-format
+msgid "Error in handshake: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:116
+#, python-format
+msgid "Invalid request: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:136
+#, python-format
+msgid "Request: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:139
+#, python-format
+msgid "Request made with missing token: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:149
+#, python-format
+msgid "Request made with invalid token: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:156
+#, python-format
+msgid "Unexpected error: %s"
+msgstr ""
+
+#: nova/vnc/xvp_proxy.py:176
+#, python-format
+msgid "Starting nova-xvpvncproxy node (version %s)"
+msgstr ""
+
+#: nova/volume/cinder.py:98
+#, python-format
+msgid "Cinderclient connection created using URL: %s"
+msgstr ""
+
+#: nova/volume/cinder.py:229
+msgid "status must be 'in-use'"
+msgstr ""
+
+#: nova/volume/cinder.py:235
+msgid "status must be 'available'"
+msgstr ""
+
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr ""
+
+#~ msgid "Got update to delete instance %(instance_uuid)s"
+#~ msgstr ""
+
diff --git a/nova/locale/fr/LC_MESSAGES/nova.po b/nova/locale/fr/LC_MESSAGES/nova.po
index 0f9f99b15..83ded3842 100644
--- a/nova/locale/fr/LC_MESSAGES/nova.po
+++ b/nova/locale/fr/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+0000\n"
 "PO-Revision-Date: 2012-05-14 08:35+0000\n"
 "Last-Translator: Erwan Gallen <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -86,7 +86,7 @@ msgstr "Chemin des propriétés: %s"
 msgid "An unknown exception occurred."
 msgstr "Une exception inconnue s'est produite."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -172,8 +172,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr "La paire de clés de donnée n'est pas valide"
 
@@ -204,7 +204,7 @@ msgstr "Signature non valide pour l'utilisateur %s"
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "La plage de port %(from_port)s:%(to_port)s. %(msg)s est invalide"
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Le protocole IP %(protocol)s est invalide"
@@ -1281,56 +1281,68 @@ msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "La paire de clés %(name)s est introuvable pour l'utilisateur %(user_id)s"
 
 #: nova/exception.py:1157
+#, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "Le quota pour le projet %(project_id)s ne peut pas être trouvé."
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Le projet %(project_id)s n'a pas été trouvé."
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "L'instance %(instance_id)s  n'est pas en mode secours"
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "L'instance %(instance_id)s  n'est pas en mode secours"
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1341,7 +1353,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1362,206 +1374,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-#, fuzzy
-msgid "Full set of CONF:"
-msgstr "Ensemble de propriétés complet :"
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, fuzzy, python-format
-msgid "Starting %d workers"
-msgstr "adresse de départ"
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, fuzzy, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr "Démarrage du noeud %(topic)s (version %(vcs_string)s)"
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "Service détruit sans entrée dans la base de données"
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr "Execution de la cmd (SSH): %s"
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr "Le résultat était %s"
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr "Debug dans le rappel : %s"
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "L'adresse du lien local n'a pas été trouvé :%s"
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Impossible de trouver l'IP du lien local de %(interface)s :%(ex)s"
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Backend invalide : %s"
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1646,7 +1577,7 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr "Trop d'erreur d'authentification"
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
@@ -1656,126 +1587,121 @@ msgstr ""
 "d'authentification et sera par conséquent vérouillée pour %(lock_mins)d "
 "minutes."
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "Echec d'authentification : %s"
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "Trop d'erreur d'authentification"
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr "action: %s"
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\tval: %(value)s"
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 "Requête non authorisé pour le controlleur=%(controller)s et "
 "l'action=%(action)s"
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "\"Instance non trouvée\" remontée : %s"
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "\"Volume non trouvé\" remonté : %s"
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "\"Non trouvé\" remonté : %s"
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "\"Erreur inopinée\" remontée : %s"
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "\"Erreur inopinée\" remontée : %s"
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "Une erreur inopinée à eu lieu. Merci d'essayer votre requête à nouveau."
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
@@ -1787,69 +1713,74 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "Impossible de déchiffrer la clef privée : %s"
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr "Création du bi-clef %s"
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Suppression du bi-clef %s"
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "Pas assez de parametres pour contruire un règle valide."
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, fuzzy, python-format
+msgid "Invalid IP protocol %s."
+msgstr "Le protocole IP %(protocol)s est invalide"
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr "Pas de règle pour les paramètres spécifiés."
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Cette règle existe déjà dans le groupe %s"
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Récupération de la sortie de la console de l'instance %s"
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Création d'un volume de %s Go"
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
@@ -1860,7 +1791,7 @@ msgstr ""
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Dé-montage du volume %s"
@@ -1871,7 +1802,7 @@ msgid "Detach Volume Failed."
 msgstr "Dé-montage du volume %s"
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "attribut non reconnu : %s"
@@ -1904,145 +1835,145 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "Association de l'adresse %(public_ip)s avec l'instance %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Désassociation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 #, fuzzy
 msgid "Floating ip is already associated."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 #, fuzzy
 msgid "l3driver call to add floating ip failed."
 msgstr "Aucune IPs dynamiques disponibles."
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Désassociation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Désassociation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 #, fuzzy
 msgid "Floating ip is not associated."
 msgstr "L'IP dynamique %(address)s n'est pas associée."
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr "Début de la destruction d'instance"
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Re-démarrage de l'instance %r"
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr "Dé-enregitrement de l'image %s"
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Image %(image_location)s enregistré avec l'id %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr "Utilisateur ou groupe non spécifié"
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr "Seul le group \"tous\" est supporté"
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr ""
 "le type d'opération (operation_type) doit être ajout (add) ou suppression"
 " (remove)"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Mis à jour de la publication de l'image %s"
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance %s: récupérée"
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "Le cidr %(cidr)s est invalide"
@@ -2084,11 +2015,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, fuzzy, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
@@ -2107,19 +2038,19 @@ msgstr ""
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -2131,63 +2062,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:364
+#: nova/api/openstack/common.py:366
 #, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -2241,14 +2172,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
 #: nova/api/openstack/extensions.py:370
 #, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2291,13 +2222,13 @@ msgstr ""
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr ""
 
@@ -2306,20 +2237,20 @@ msgstr ""
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, fuzzy, python-format
 msgid "Calling method %s"
 msgstr "Appel du getter %s"
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2332,12 +2263,12 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2345,17 +2276,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, fuzzy, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr "Signature non valide pour l'utilisateur %s"
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, fuzzy, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr "Signature non valide pour l'utilisateur %s"
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2420,215 +2351,215 @@ msgstr ""
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 #, fuzzy
 msgid "Only administrators may list deleted instances"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, fuzzy, python-format
 msgid "Flavor '%s' could not be found "
 msgstr "L'hôte %(host)s ne peut pas être trouvé."
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "Le point de montage ne peut pas être traduit : %s"
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "Le point de montage ne peut pas être traduit : %s"
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2636,9 +2567,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
+#: nova/api/openstack/compute/servers.py:1408
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+msgid "Removing options '%s' from query"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2725,7 +2656,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2745,17 +2676,17 @@ msgstr "compute.api::resume %s"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2914,15 +2845,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
@@ -3034,7 +2965,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "L'IP dynamique %(address)s n'est pas associée."
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3068,29 +2999,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Appel du getter %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Appel du getter %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3317,33 +3248,33 @@ msgstr ""
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, fuzzy, python-format
 msgid "Instance %s is not attached."
 msgstr "instance %s: a démarrée"
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3362,96 +3293,94 @@ msgstr "Désallocation de l'adresse %s"
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "Pas de méthode pour le message : %s"
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "Pas de méthode pour le message : %s"
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, fuzzy, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
-msgstr ""
-"Migration non trouvée pour l'instance %(instance_id)s avec le statut "
-"%(status)s."
+msgid "Got update for instance: %(instance)s"
+msgstr "Volume non trouvé pour l'instance %(instance_id)s."
 
-#: nova/cells/messaging.py:838
+#: nova/cells/messaging.py:862
 #, fuzzy, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+msgid "Got update to delete instance"
 msgstr "Volume non trouvé pour l'instance %(instance_id)s."
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3468,7 +3397,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "Volume non trouvé pour l'instance %(instance_id)s."
@@ -3482,7 +3411,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3509,7 +3438,7 @@ msgstr "Masque réseau à passer à la configuration d'openvpn"
 msgid "Launching VPN for %s"
 msgstr "Démarrage du VPN pour %s"
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, fuzzy, python-format
 msgid "Failed to load %s"
 msgstr "Impossible de trouver le volume %s"
@@ -3529,279 +3458,279 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 #, fuzzy
 msgid "Reserved"
 msgstr "%s reçu"
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 #, fuzzy
 msgid "network"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 #, fuzzy
 msgid "IP address"
 msgstr "adresse de départ"
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 #, fuzzy
 msgid "No fixed IP found."
 msgstr "Aucunes IPs fixes trouvées."
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "adresse de départ"
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 #, fuzzy
 msgid "No networks found"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "%(req)s est requis pour créer un réseau."
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 #, fuzzy
 msgid "instance"
 msgstr "Re-démarrage de l'instance %r"
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "Le service %(service_id)s ne peut pas être trouvé."
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "Le service %(service_id)s ne peut pas être trouvé."
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "\"Erreur inopinée\" remontée : %s"
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3882,255 +3811,255 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr ""
 "Quota d'instances dépassé. Vous ne pouvez éxécuter que %s instances de ce"
 " type de plus."
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 "Quota d'instances dépassé. Vous ne pouvez éxécuter que %s instances de ce"
 " type de plus."
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Impossible d'attacher le volume à l'instance %s"
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Démarrage de %s instances..."
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Début de la destruction d'instance"
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "Le type d'instance %(instance_type_id)s ne peut être trouvé."
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Début de la destruction d'instance"
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Début de création d'instantané (snapshot) pour la VM %s"
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Création du groupe de sécurité %s"
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Impossible de supprimer le VBD %s"
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Révocation de groupe de sécurité %s"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorisation du groupe de sécurité %s"
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Révocation de groupe de sécurité %s"
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4165,84 +4094,84 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
@@ -4251,650 +4180,655 @@ msgstr ""
 "Impossible de migrer l'instance (%(instance_id)s) vers l'hôte actuel "
 "(%(host)s)."
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "\"Erreur inopinée\" remontée : %s"
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Redémarrage de l'instance %s"
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Dé-montage du volume %s"
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Redémarrage de l'instance %s"
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "Instance actives : %s"
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: re-démarrée"
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: création d'un instantané (snapshot)"
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, fuzzy, python-format
 msgid "injecting file to %(path)s"
 msgstr "Injection du chemin d'accès : '%s'"
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instance %s: dé-récupération"
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "instance %s: création d'un instantané (snapshot)"
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: récupération des diagnostiques"
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 #, fuzzy
 msgid "Reset network"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 #, fuzzy
 msgid "Inject network info"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 #, fuzzy
 msgid "Get console output"
 msgstr "Récupération de la sortie de la console de l'instance %s"
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Ajout de console"
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Ajout de console"
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Démontage de volume d'une instance inconnue %s"
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, fuzzy, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr "Le réseau %(network_id)s n'a pas été trouvé."
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, fuzzy, python-format
 msgid "Host %(host)s not found"
 msgstr "L'hôte %(host)s ne peut pas être trouvé."
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Suppression de l'utilisateur %s"
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instance %s: a démarrée"
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Suppression de l'utilisateur %s"
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, fuzzy, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr "L'instance de type %(instance_type)s est invalide."
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -5005,7 +4939,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5016,7 +4950,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5096,56 +5030,52 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 #, fuzzy
 msgid "Failed to notify cells of instance update"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 #, fuzzy
 msgid "Failed to notify cells of instance fault"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: récupérée"
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5162,51 +5092,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5291,16 +5221,20 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 #, fuzzy
 msgid "Failed storing info cache"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, fuzzy, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr "Association de l'adresse %(public_ip)s avec l'instance %(instance_id)s"
@@ -5415,103 +5349,103 @@ msgstr ""
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, fuzzy, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr "Pid %d est dépassé, re-démarrage de dnsmasq"
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Hupping dnsmasq à renvoyé %s"
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d est dépassé, re-démarrage de dnsmasq"
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "La destruction de radvd à renvoyé %s"
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d est dépassé, re-démarrage radvd"
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "Backend invalide : %s"
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Démarrage de l'interface VLAN %s"
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Démarrage de l'interface de Bridge %s"
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "L'interface %(interface)s non trouvée."
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Démarrage de l'interface de Bridge %s"
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Erreur au démarrage xvp : %s"
@@ -5607,38 +5541,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "La somme du nombre de réseau et le début de vlan ne peut excéder 4094"
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5674,7 +5608,7 @@ msgstr "%s reçu"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5757,70 +5691,70 @@ msgstr "Aucune IP dynamique trouvée pour l'id %(id)s."
 msgid "Quantum Error creating security group %s"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Révocation de groupe de sécurité %s"
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Erreur interceptée : %s"
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Le groupe de sécurité avec la règle %(rule_id)s non trouvé."
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, fuzzy, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 "Groupe de sécurité %(security_group_id)s non trouvé pour le projet "
 "%(project_id)s."
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5839,27 +5773,27 @@ msgstr "Cette règle existe déjà dans le groupe %s"
 msgid "Original exception being dropped: %s"
 msgstr "Le quota ne peut pas être trouvé"
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5869,17 +5803,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr "%s reçu"
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5952,11 +5886,92 @@ msgstr ""
 msgid "Running cmd (subprocess): %s"
 msgstr "Execution de la commande (sous-processus) : %s"
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr "Le résultat était %s"
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr "Execution de la cmd (SSH): %s"
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+#, fuzzy
+msgid "Full set of CONF:"
+msgstr "Ensemble de propriétés complet :"
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, fuzzy, python-format
+msgid "Starting %d workers"
+msgstr "adresse de départ"
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr ""
@@ -6095,58 +6110,63 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 #, fuzzy
 msgid "An unknown RPC related exception occurred."
 msgstr "Une exception inconnue s'est produite."
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr "Réutilisation invalide d'une connexion RPC"
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Renvoi de l'exception %s à l'appelant"
@@ -6466,7 +6486,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6475,36 +6495,48 @@ msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, fuzzy, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr "Volume non trouvé pour l'instance %(instance_id)s."
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:357
+#: nova/scheduler/filter_scheduler.py:361
 #, python-format
-msgid "Choosing host %(chosen_host)s"
+msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6701,46 +6733,46 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr "Récupération du modelle de connexion serveur terminée!"
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr "Le modèle de serveur à disparu"
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 msgid "memcached_servers not defined"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6793,58 +6825,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr "Tentative d'instanciation d'un singleton"
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 #, fuzzy
 msgid "fake vswitch not found"
@@ -6879,17 +6895,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6898,7 +6914,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr "Instance actives : %s"
@@ -6915,16 +6931,16 @@ msgstr "Après l'arrêt d'instances : %s"
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 msgid "spawn error"
 msgstr ""
 
@@ -7020,6 +7036,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -7044,11 +7076,10 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -7174,19 +7205,19 @@ msgstr ""
 "Sortie standard : %(stdout)r\n"
 "Sortie d'erreur : %(stderr)r"
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7354,15 +7385,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7421,101 +7452,101 @@ msgstr ""
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, fuzzy, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 "instance %(inst_name)s : l'erreur d'injection de donné dans l'image "
 "%(img_id)s (%(e)s) a été ignorée"
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, fuzzy, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr "Impossible de monter le système de fichier : %s"
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, fuzzy, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr "Impossible de monter le système de fichier : %s"
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, fuzzy, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 "instance %(inst_name)s : l'erreur d'injection de donné dans l'image "
 "%(img_id)s (%(e)s) a été ignorée"
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7852,7 +7883,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7867,24 +7898,24 @@ msgstr "Récupération de la sortie de la console de l'instance %s"
 msgid "Host IP address is: %s"
 msgstr "Désallocation de l'adresse %s"
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8208,12 +8239,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Début de la destruction d'instance"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "Injection du chemin d'accès : '%s'"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "Injection du chemin d'accès : '%s'"
@@ -8379,7 +8410,7 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Création d'une instance raw"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8447,209 +8478,209 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr "Connexion à libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Aucun réseau défini."
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Aucun réseau défini."
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "instance %s: re-démarrée"
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "L’utilisateur n'a pas les privilèges administrateur"
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Demande de chargement à xapi de %(vdi_uuids)s en tant qu'ID %(image_id)s"
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, fuzzy, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 "instance %(inst_name)s : l'erreur d'injection de donné dans l'image "
 "%(img_id)s (%(e)s) a été ignorée"
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8657,73 +8688,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8731,50 +8762,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8784,67 +8815,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "Echec d'authentification : %s"
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8877,153 +8908,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, fuzzy, python-format
 msgid "Writing stored info to %s"
 msgstr "Démarrage de l'interface de Bridge %s"
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -9136,87 +9167,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, fuzzy, python-format
 msgid "%s is already mounted"
 msgstr "le groupe %s existe déjà"
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9290,35 +9321,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, fuzzy, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr "Execution de la commande (sous-processus) : %s"
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 #, fuzzy
 msgid "File transfer from PowerVM manager failed"
 msgstr "La connexion à Melange a échoué"
@@ -9411,74 +9442,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, fuzzy, python-format
 msgid "LPAR instance '%s' not found"
 msgstr "Aucuns types d'instance trouvés."
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, fuzzy, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr "Démarrage de l'interface de Bridge %s"
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, fuzzy, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr "Création d'une instance raw"
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, fuzzy, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr "instance %s : Création de l'image"
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, fuzzy, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr "Création d'une instance raw"
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, fuzzy, python-format
 msgid "Instance '%s' failed to boot"
 msgstr "instance %s: re-démarrée"
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, fuzzy, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr "instance %s: création d'un instantané (snapshot)"
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, fuzzy, python-format
 msgid "Shutting down the instance '%s'"
 msgstr "Démarrage de %s instances..."
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, fuzzy, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr "Démarrage de %s instances..."
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9941,7 +9972,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -10105,19 +10136,19 @@ msgstr ""
 "Le point de montage %(mountpoint)s à été détaché de l'instance "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -10225,24 +10256,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Impossible de déchiffrer la clef privée : %s"
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr "Reçu exception : %s"
@@ -10381,72 +10412,72 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD non trouvé dans l'instance %s"
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "le groupe %s existe déjà"
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Impossible de deconnecter le VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Impossible de supprimer le VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "VBD créé %(vbd_ref)s pour VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "VBD créé %(vbd_ref)s pour VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -10455,239 +10486,239 @@ msgstr ""
 "VDI créé %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) on"
 " %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 #, fuzzy
 msgid "SR not present and could not be introduced"
 msgstr "Le quota ne peut pas être trouvé"
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, fuzzy, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr "Aucun id destination trouvé pour le volume %(volume_id)s."
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "Début de création d'instantané (snapshot) pour la VM %s"
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, fuzzy, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr "Demande de chargement à xapi de %(vdi_uuids)s en tant qu'ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "Image %(image_location)s enregistré avec l'id %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Taille de l'image %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copie de VDI %s vers /boot/guest sur dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Noyau/Ramdisk VDI %s détruit"
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Recherche du VDI %s pour le PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr "Le VDI %s est toujours disponible"
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-parcours de SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s à pour parent %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -10696,66 +10727,66 @@ msgstr ""
 "L'UUID parent %(parent_uuid)s ne correspond pas au parent originel "
 "%(original_parent_uuid)s, attente de coalesence..."
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Connexion de VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Connexion de VBD %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destruction de VBD pour la VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destruction de VBD pour la VDI %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Exécution de pygrub sur %s"
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen %s trouvé"
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Pas de kernel Xen trouvé.  Démarrage en HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10763,55 +10794,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Ecriture de la table de partitionnement %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -10825,200 +10863,210 @@ msgstr "Démarrage de l'interface de Bridge %s"
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 #, fuzzy
 msgid "Starting instance"
 msgstr "Création d'une instance raw"
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 #, fuzzy
 msgid "Starting VM"
 msgstr "Re-démarrage xvp"
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "Fin de l'instantané et du chargement de VM %s"
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+#, fuzzy
+msgid "Unable to terminate instance."
+msgstr "Échec du redémarrage de l'instance"
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 #, fuzzy
 msgid "Destroying VDIs"
 msgstr "Re-démarrage xvp"
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr "Fichiers noyau/ramdisk supprimés"
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 #, fuzzy
 msgid "Destroying VM"
 msgstr "Re-démarrage xvp"
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Création du VIF pour la VM %(vm_ref)s, réseau %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Création du VIF pour la VM %(vm_ref)s, réseau %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -11147,16 +11195,27 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 msgid "status must be 'in-use'"
 msgstr ""
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr ""
+#~ "Migration non trouvée pour l'instance "
+#~ "%(instance_id)s avec le statut %(status)s."
+
diff --git a/nova/locale/it/LC_MESSAGES/nova.po b/nova/locale/it/LC_MESSAGES/nova.po
index b004f4764..cb1581cc1 100644
--- a/nova/locale/it/LC_MESSAGES/nova.po
+++ b/nova/locale/it/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+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"
@@ -84,7 +84,7 @@ msgstr "Percorso dei flags: %s"
 msgid "An unknown exception occurred."
 msgstr "E' stato riscontrato un errore sconosciuto"
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -168,8 +168,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -199,7 +199,7 @@ msgstr ""
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
@@ -1238,55 +1238,67 @@ msgstr ""
 
 #: nova/exception.py:1157
 #, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "istanza %s: creazione snapshot in corso"
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1297,7 +1309,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1318,206 +1330,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-#, fuzzy
-msgid "Full set of CONF:"
-msgstr "Insieme di FLAGS:"
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, python-format
-msgid "Starting %d workers"
-msgstr ""
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "Servizio terminato che non ha entry nel database"
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr "Eseguendo cmd (SSH): %s"
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr "Il risultato é %s"
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1602,130 +1533,125 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
@@ -1735,69 +1661,74 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, python-format
+msgid "Invalid IP protocol %s."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
@@ -1806,7 +1737,7 @@ msgstr ""
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
@@ -1816,7 +1747,7 @@ msgid "Detach Volume Failed."
 msgstr ""
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
@@ -1848,138 +1779,138 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "istanza %s: ripristino"
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2020,11 +1951,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, fuzzy, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr "Impossibile sospendere l'istanza"
@@ -2043,19 +1974,19 @@ msgstr ""
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -2067,63 +1998,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:364
+#: nova/api/openstack/common.py:366
 #, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -2177,14 +2108,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
 #: nova/api/openstack/extensions.py:370
 #, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2227,13 +2158,13 @@ msgstr ""
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr ""
 
@@ -2242,20 +2173,20 @@ msgstr ""
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, fuzzy, python-format
 msgid "Calling method %s"
 msgstr "Dichiarando la coda %s"
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2268,12 +2199,12 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2281,17 +2212,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2356,211 +2287,211 @@ msgstr ""
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, python-format
 msgid "Flavor '%s' could not be found "
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2568,9 +2499,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
+#: nova/api/openstack/compute/servers.py:1408
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+msgid "Removing options '%s' from query"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2657,7 +2588,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2677,17 +2608,17 @@ msgstr "compute.api::resume %s"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2843,15 +2774,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
@@ -2960,7 +2891,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -2993,29 +2924,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Dichiarando la coda %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Dichiarando la coda %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3237,33 +3168,33 @@ msgstr ""
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, fuzzy, python-format
 msgid "Instance %s is not attached."
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3282,94 +3213,94 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, fuzzy, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
-msgstr "istanza %s: creazione snapshot in corso"
+msgid "Got update for instance: %(instance)s"
+msgstr "Mountpoint %(mountpoint)s montato all'istanza %(instance_name)s"
 
-#: nova/cells/messaging.py:838
+#: nova/cells/messaging.py:862
 #, fuzzy, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+msgid "Got update to delete instance"
 msgstr "Mountpoint %(mountpoint)s montato all'istanza %(instance_name)s"
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3386,7 +3317,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3400,7 +3331,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3426,7 +3357,7 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, fuzzy, python-format
 msgid "Failed to load %s"
 msgstr "Impossibile localizzare il volume %s"
@@ -3446,273 +3377,273 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 #, fuzzy
 msgid "Reserved"
 msgstr "ricevuto %s"
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 #, fuzzy
 msgid "network"
 msgstr "istanza %s: ripristino rete"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 #, fuzzy
 msgid "instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3793,246 +3724,246 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4067,726 +3998,731 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Impossibile smontare il volume %s"
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "istanza %s: ricezione diagnostiche"
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 #, fuzzy
 msgid "Reset network"
 msgstr "istanza %s: ripristino rete"
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, fuzzy, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, fuzzy, python-format
 msgid "Host %(host)s not found"
 msgstr "istanza %s: sospensione in corso"
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -4896,7 +4832,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -4907,7 +4843,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -4987,56 +4923,52 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 #, fuzzy
 msgid "Failed to notify cells of instance update"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 #, fuzzy
 msgid "Failed to notify cells of instance fault"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5053,51 +4985,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5182,16 +5114,20 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 #, fuzzy
 msgid "Failed storing info cache"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -5305,103 +5241,103 @@ msgstr ""
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Avviando l'interfaccia VLAN %s"
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Avviando l'interfaccia Bridge per %s"
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Avviando l'interfaccia Bridge per %s"
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5496,38 +5432,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5563,7 +5499,7 @@ msgstr "ricevuto %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5646,65 +5582,65 @@ msgstr ""
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5721,27 +5657,27 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5751,17 +5687,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr "ricevuto %s"
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5834,11 +5770,92 @@ msgstr ""
 msgid "Running cmd (subprocess): %s"
 msgstr "Esecuzione del comando (sottoprocesso): %s"
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr "Il risultato é %s"
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr "Eseguendo cmd (SSH): %s"
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+#, fuzzy
+msgid "Full set of CONF:"
+msgstr "Insieme di FLAGS:"
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr ""
@@ -5977,58 +5994,63 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 #, fuzzy
 msgid "An unknown RPC related exception occurred."
 msgstr "E' stato riscontrato un errore sconosciuto"
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Sollevando eccezione %s al chiamante"
@@ -6346,7 +6368,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6355,36 +6377,48 @@ msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, fuzzy, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr "Mountpoint %(mountpoint)s montato all'istanza %(instance_name)s"
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:357
+#: nova/scheduler/filter_scheduler.py:361
 #, python-format
-msgid "Choosing host %(chosen_host)s"
+msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6579,46 +6613,46 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr "Connessione al model server ripristinata!"
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr "model server é scomparso"
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 msgid "memcached_servers not defined"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6671,58 +6705,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr ""
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 msgid "fake vswitch not found"
 msgstr ""
@@ -6756,17 +6774,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6775,7 +6793,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
@@ -6792,16 +6810,16 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 msgid "spawn error"
 msgstr ""
 
@@ -6897,6 +6915,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -6921,11 +6955,10 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -7051,19 +7084,19 @@ msgstr ""
 "Stdout: %(stdout)r\n"
 "Stderr: %(stderr)r"
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7231,15 +7264,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7297,97 +7330,97 @@ msgstr ""
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7723,7 +7756,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7737,24 +7770,24 @@ msgstr ""
 msgid "Host IP address is: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8078,12 +8111,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8249,7 +8282,7 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8317,205 +8350,205 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: creato con successo"
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "L'utente non ha i privilegi dell'amministratore"
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8523,73 +8556,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Impossibile smontare il volume %s"
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8597,50 +8630,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8650,67 +8683,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8743,153 +8776,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, fuzzy, python-format
 msgid "Writing stored info to %s"
 msgstr "Avviando l'interfaccia Bridge per %s"
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -9002,87 +9035,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9156,35 +9189,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, fuzzy, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr "Esecuzione del comando (sottoprocesso): %s"
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
@@ -9275,74 +9308,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, fuzzy, python-format
 msgid "LPAR instance '%s' not found"
 msgstr "istanza %s: sospensione in corso"
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, fuzzy, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr "Avviando l'interfaccia Bridge per %s"
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, fuzzy, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, fuzzy, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, python-format
 msgid "Instance '%s' failed to boot"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, fuzzy, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, python-format
 msgid "Shutting down the instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9799,7 +9832,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -9959,19 +9992,19 @@ msgstr "Impossibile smontare il volume %s"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s smontato dall'istanza %(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -10075,24 +10108,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -10229,375 +10262,375 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s distrutti"
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Cercando vdi %s per kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10605,55 +10638,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -10667,195 +10707,205 @@ msgstr "Avviando l'interfaccia Bridge per %s"
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 #, fuzzy
 msgid "Starting instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+#, fuzzy
+msgid "Unable to terminate instance."
+msgstr "Impossibile riavviare l'istanza"
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -10984,16 +11034,25 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 msgid "status must be 'in-use'"
 msgstr ""
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr "istanza %s: creazione snapshot in corso"
+
diff --git a/nova/locale/ja/LC_MESSAGES/nova.po b/nova/locale/ja/LC_MESSAGES/nova.po
index d75fc6627..e93810ab2 100644
--- a/nova/locale/ja/LC_MESSAGES/nova.po
+++ b/nova/locale/ja/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+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"
@@ -84,7 +84,7 @@ msgstr "Flags �パス: %s"
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -168,8 +168,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -200,7 +200,7 @@ msgstr "Invalid signature: ユーザ %s �署���正��。"
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
@@ -1240,55 +1240,67 @@ msgstr ""
 
 #: nova/exception.py:1157
 #, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "インスタンス %s: 起動����。"
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1299,7 +1311,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1320,206 +1332,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-#, fuzzy
-msgid "Full set of CONF:"
-msgstr "FLAGS�一覧:"
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, fuzzy, python-format
-msgid "Starting %d workers"
-msgstr "開始アドレス"
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, fuzzy, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr "%(topic)s ノードを開始����� (�ージョン %(vcs_string)s)"
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "データベース�エントリ�存在���サービスを終了���。"
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr "コマンド（SSH)を実行: %s"
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr "コマンド実行�果： %s"
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr "コール�ック中�デ�ッグ: %s"
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "リンクローカルアドレス�見��り��ん: %s"
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "%(interface)s �ローカルIPアドレス�リンク��得����ん:%(ex)s"
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "�正��ックエンド��: %s"
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1604,131 +1535,126 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr "�証失敗�回数�多����。"
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr "アクセスキー %(access_key)s � %(failures)d 回�証�失敗�������%(lock_mins)d 分間ロック���。"
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "%s ��証�失敗����。"
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "�証失敗�回数�多����。"
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr "アクション(action): %s"
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "引数: %(key)s\t\t値: %(value)s"
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "コントローラ=%(controller)s �アクション=%(action)s 用�許��れ����リクエスト"
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "InstanceNotFound �発行�れ���: %s"
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "VolumeNotFound �発行�れ���: %s"
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "NotFound 発生: %s"
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "予期���エラー発生: %s"
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "予期���エラー発生: %s"
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "未知�エラー�発生����。�度リクエストを実行������。"
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "未サ�ート� API リクエスト: コントローラ = %(controller)s, アクション = %(action)s"
@@ -1738,69 +1664,74 @@ msgstr "未サ�ート� API リクエスト: コントローラ = %(controlle
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "プライベートキー�復��失敗����: %s"
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr "Create key pair: キーペア %s を作����。"
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Delete key pair: キーペア %s を削除���。"
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "有効�ルールを作��る為��分�パラメータ��り��ん"
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, python-format
+msgid "Invalid IP protocol %s."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr "指定�れ�パラメータ�該当�るルール��り��ん。"
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "指定�れ�ルール�既�グループ %s �存在�����。"
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output: インスタンス %s �コンソール出力を�得���。"
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Create volume: %s GB�ボリュームを作����。"
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "ボリューム %(volume_id)s をインスタンス %(instance_id)s �デ�イス %(device)s �接続"
@@ -1809,7 +1740,7 @@ msgstr "ボリューム %(volume_id)s をインスタンス %(instance_id)s ã�®ã
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Detach volume: ボリューム %s をデタッ����"
@@ -1820,7 +1751,7 @@ msgid "Detach Volume Failed."
 msgstr "Detach volume: ボリューム %s をデタッ����"
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "アトリビュート %s �サ�ート�れ����ん。"
@@ -1852,140 +1783,140 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "インスタンス %(instance_id)s �アドレス %(public_ip)s を割り当�"
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Disassociate address: アドレス %s �関連付�を解除���。"
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Disassociate address: アドレス %s �関連付�を解除���。"
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Disassociate address: アドレス %s �関連付�を解除���。"
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reboot instance: インスタンス %r を�起動���。"
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr "De-registering image: イメージ %s を登録解除���。"
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "イメージ %(image_location)s � ID %(image_id)s �登録�れ���"
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr "ユーザ���グループ�指定�れ����ん。"
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr "グループ  \"all\" ��サ�ート�れ����。"
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr "operation_type � add ��� remove �何れ���る必���り��。"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "イメージ %s �公開設定を更新���。"
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "インスタンス %s: rescued"
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2025,11 +1956,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, fuzzy, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr "ip %s �対�るメタデータ��得�失敗����。"
@@ -2048,19 +1979,19 @@ msgstr ""
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -2072,63 +2003,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:364
+#: nova/api/openstack/common.py:366
 #, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -2182,14 +2113,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
 #: nova/api/openstack/extensions.py:370
 #, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2232,13 +2163,13 @@ msgstr ""
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr ""
 
@@ -2247,20 +2178,20 @@ msgstr ""
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, fuzzy, python-format
 msgid "Calling method %s"
 msgstr "getter %s をコール���。"
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2273,12 +2204,12 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2286,17 +2217,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, fuzzy, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr "Invalid signature: ユーザ %s �署���正��。"
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, fuzzy, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr "Invalid signature: ユーザ %s �署���正��。"
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2361,214 +2292,214 @@ msgstr ""
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 #, fuzzy
 msgid "Only administrators may list deleted instances"
 msgstr "%s を�止�よ�������"
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, python-format
 msgid "Flavor '%s' could not be found "
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "マウント�イントを変�����ん。 %s"
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "マウント�イントを変�����ん。 %s"
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2576,9 +2507,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
+#: nova/api/openstack/compute/servers.py:1408
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+msgid "Removing options '%s' from query"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2665,7 +2596,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2685,17 +2616,17 @@ msgstr "例外: compute.api::resume %s"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2853,15 +2784,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
@@ -2971,7 +2902,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "インスタンス %(instance_id)s �アドレス %(public_ip)s を割り当�"
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3005,29 +2936,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "getter %s をコール���。"
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "getter %s をコール���。"
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3252,33 +3183,33 @@ msgstr ""
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, fuzzy, python-format
 msgid "Instance %s is not attached."
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3297,94 +3228,94 @@ msgstr "Release address: アドレス %s を開放���。"
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "メッセージ %s �対�るメソッド�存在���ん。"
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "メッセージ %s �対�るメソッド�存在���ん。"
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, fuzzy, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+msgid "Got update for instance: %(instance)s"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/cells/messaging.py:838
+#: nova/cells/messaging.py:862
 #, fuzzy, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+msgid "Got update to delete instance"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3401,7 +3332,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "インスタンス %(instance_id)s �アドレス %(public_ip)s を割り当�"
@@ -3415,7 +3346,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3442,7 +3373,7 @@ msgstr "openvpn�設定�入れる�ットマスク�値"
 msgid "Launching VPN for %s"
 msgstr "%s 用�VPNを起動���。"
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, fuzzy, python-format
 msgid "Failed to load %s"
 msgstr "ボリューム %s �存在�確�����ん。"
@@ -3462,277 +3393,277 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 #, fuzzy
 msgid "Reserved"
 msgstr "�信： %s"
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "エラー %s をキャッ�����。"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 #, fuzzy
 msgid "network"
 msgstr "�ットワークホスト�設定を���。"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 #, fuzzy
 msgid "IP address"
 msgstr "開始アドレス"
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "グループ %s �既�存在�����。"
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "開始アドレス"
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 #, fuzzy
 msgid "No networks found"
 msgstr "�ットワークホスト�設定を���。"
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 #, fuzzy
 msgid "instance"
 msgstr "Reboot instance: インスタンス %r を�起動���。"
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "予期���エラー発生: %s"
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3813,251 +3744,251 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr "インスタンス�クオータを超����。��タイプ������� %s インスタンス��実行����ん。"
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "インスタンス�クオータを超����。��タイプ������� %s インスタンス��実行����ん。"
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "インスタンス %s �ボリュームを接続(attach)����ん。"
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "%s 個�インスタンス�起動を始���…"
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "VM %s �対�るスナップショットを開始���。"
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group: セキュリティグループ %s を作����。"
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "VBD %s �削除�失敗����。"
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revoke security group ingress: セキュリティグループ許� %s ��消"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group: セキュリティグループ %s を削除���。"
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorize security group ingress: セキュリティグループ許� %s"
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress: セキュリティグループ許� %s ��消"
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4092,734 +4023,739 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "予期���エラー発生: %s"
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "エラー %s をキャッ�����。"
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Rebooting instance: インスタンス %s を�起動���。"
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Detach volume: ボリューム %s をデタッ����"
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Rebooting instance: インスタンス %s を�起動���。"
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "インスタンス %s �実行中��。"
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "インスタンス%s: �起動����。"
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "snapshotting: インスタンス %s �スナップショットを�得中"
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, fuzzy, python-format
 msgid "injecting file to %(path)s"
 msgstr "ファイルパス '%s' を埋�込ん����"
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "エラー %s をキャッ�����。"
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 #, fuzzy
 msgid "Unrescuing"
 msgstr "Unrescuing: インスタンス %s をアンレスキュー���。"
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "snapshotting: インスタンス %s �スナップショットを�得中"
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "retrieving diagnostics: インスタンス %s �診断情報を�得���。"
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 #, fuzzy
 msgid "Reset network"
 msgstr "�ットワークホスト�設定を���。"
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 #, fuzzy
 msgid "Inject network info"
 msgstr "�ットワークホスト�設定を���。"
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 #, fuzzy
 msgid "Get console output"
 msgstr "Get console output: インスタンス %s �コンソール出力を�得���。"
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "コンソールを追加�����"
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 #, fuzzy
 msgid "Getting spice console"
 msgstr "コンソールを追加�����"
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "ボリュームを未知�インスタンス %s �らデタッ����。"
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, fuzzy, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, fuzzy, python-format
 msgid "Host %(host)s not found"
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "ip %s �対�るメタデータ��得�失敗����。"
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Deleting user: ユーザ %s を削除���。"
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Deleting user: ユーザ %s を削除���。"
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -4929,7 +4865,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -4940,7 +4876,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5019,54 +4955,50 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "インスタンス %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5083,51 +5015,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5212,16 +5144,20 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 #, fuzzy
 msgid "Failed storing info cache"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, fuzzy, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr "インスタンス %(instance_id)s �アドレス %(public_ip)s を割り当�"
@@ -5335,103 +5271,103 @@ msgstr ""
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, fuzzy, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr "Pid %d �無効��。dnsmasqを�実行���。"
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "dnsmasq�対��hupを�信����� %s �発生����。"
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d �無効��。dnsmasqを�実行���。"
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "radvd  �止� %s 例外を発行����"
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d �ストール���る�� radvd を�実行�����…"
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "�正��ックエンド��: %s"
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "VLANインタフェース %s を開始���。"
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "%s 用�ブリッジインタフェースを開始���。"
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "プライベートキー�復��失敗����: %s"
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "%s 用�ブリッジインタフェースを開始���。"
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "xvp �開始中�エラー: %s"
@@ -5526,38 +5462,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "�ットワーク�数�VLAN�開始番��和� 4094 より大������ん。"
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5593,7 +5529,7 @@ msgstr "�信： %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5676,68 +5612,68 @@ msgstr "�ットワークホスト�設定を���。"
 msgid "Quantum Error creating security group %s"
 msgstr "Delete security group: セキュリティグループ %s を削除���。"
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Delete security group: セキュリティグループ %s を削除���。"
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "エラー %s をキャッ�����。"
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Delete security group: セキュリティグループ %s を削除���。"
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Revoke security group ingress: セキュリティグループ許� %s ��消"
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Delete security group: セキュリティグループ %s を削除���。"
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "エラー %s をキャッ�����。"
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Authorize security group ingress: セキュリティグループ許� %s"
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5754,27 +5690,27 @@ msgstr "指定ã�•ã‚Œã�Ÿãƒ«ãƒ¼ãƒ«ã�¯æ—¢ã�«ã‚°ãƒ«ãƒ¼ãƒ— %s ã�«å­˜åœ¨ã�—ã�¦ã�„ã�¾ã�
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5784,17 +5720,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr "�信： %s"
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5867,11 +5803,92 @@ msgstr ""
 msgid "Running cmd (subprocess): %s"
 msgstr "コマンド実行(subprocess): %s"
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr "コマンド実行�果： %s"
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr "コマンド（SSH)を実行: %s"
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+#, fuzzy
+msgid "Full set of CONF:"
+msgstr "FLAGS�一覧:"
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, fuzzy, python-format
+msgid "Starting %d workers"
+msgstr "開始アドレス"
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr ""
@@ -6010,57 +6027,62 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "呼�出�元� 例外 %s を返����。"
@@ -6379,7 +6401,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6388,36 +6410,48 @@ msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, fuzzy, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr "インスタンス終了処�を開始���。"
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:357
+#: nova/scheduler/filter_scheduler.py:361
 #, python-format
-msgid "Choosing host %(chosen_host)s"
+msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6612,46 +6646,46 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr "モデルサー���接続を復旧����。"
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr "モデルサー��消滅����。"
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 msgid "memcached_servers not defined"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6704,58 +6738,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr "シングルトンをインスタンス化�よ������。"
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 #, fuzzy
 msgid "fake vswitch not found"
@@ -6790,17 +6808,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6809,7 +6827,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr "インスタンス %s �実行中��。"
@@ -6826,16 +6844,16 @@ msgstr "インスタンス %s を終了��後��。"
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 msgid "spawn error"
 msgstr ""
 
@@ -6931,6 +6949,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -6955,11 +6989,10 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -7084,19 +7117,19 @@ msgstr ""
 "標準出力: %(stdout)r\n"
 "標準エラー出力: %(stderr)r"
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7264,15 +7297,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7330,97 +7363,97 @@ msgstr ""
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, fuzzy, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr "インスタンス %(inst_name)s: イメージ %(img_id)s ��データ埋�込��エラーを無視����� (%(e)s)"
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, fuzzy, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr "ファイルシステム %s �マウント�失敗����。"
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, fuzzy, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr "ファイルシステム %s �マウント�失敗����。"
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, fuzzy, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr "インスタンス %(inst_name)s: イメージ %(img_id)s ��データ埋�込��エラーを無視����� (%(e)s)"
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7756,7 +7789,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7771,24 +7804,24 @@ msgstr "Get console output: インスタンス %s �コンソール出力を�
 msgid "Host IP address is: %s"
 msgstr "Release address: アドレス %s を開放���。"
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8112,12 +8145,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "ファイルパス '%s' を埋�込ん����"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "ファイルパス '%s' を埋�込ん����"
@@ -8283,7 +8316,7 @@ msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "raw instanceを生����。"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8351,203 +8384,203 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr "libvirt %s �接続���。"
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "%s を�止�よ�������"
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "インスタンス%s: �起動����。"
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "データ: %(data)r, ファイルパス: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "ID %(image_id)s ��� %(vdi_uuids)s �アップロード�為� xapi を����������"
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, fuzzy, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr "インスタンス %(inst_name)s: イメージ %(img_id)s ��データ埋�込��エラーを無視����� (%(e)s)"
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8555,73 +8588,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "ip %s �対�るメタデータ��得�失敗����。"
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8629,50 +8662,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8682,67 +8715,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "%s ��証�失敗����。"
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8775,153 +8808,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, fuzzy, python-format
 msgid "Writing stored info to %s"
 msgstr "%s 用�ブリッジインタフェースを開始���。"
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -9034,87 +9067,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, fuzzy, python-format
 msgid "%s is already mounted"
 msgstr "グループ %s �既�存在�����。"
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9187,35 +9220,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, fuzzy, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr "コマンド実行(subprocess): %s"
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
@@ -9306,74 +9339,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, fuzzy, python-format
 msgid "LPAR instance '%s' not found"
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, fuzzy, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr "%s 用�ブリッジインタフェースを開始���。"
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, fuzzy, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr "raw instanceを生����。"
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, fuzzy, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr "インスタンス %s �イメージを生����。"
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, fuzzy, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr "raw instanceを生����。"
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, fuzzy, python-format
 msgid "Instance '%s' failed to boot"
 msgstr "インスタンス%s: �起動����。"
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, fuzzy, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr "snapshotting: インスタンス %s �スナップショットを�得中"
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, fuzzy, python-format
 msgid "Shutting down the instance '%s'"
 msgstr "%s 個�インスタンス�起動を始���…"
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, fuzzy, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr "%s 個�インスタンス�起動を始���…"
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9836,7 +9869,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -9996,19 +10029,19 @@ msgstr "ボリューム %s を切断(detach)����ん"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "インスタンス %(instance_name)s �らマウント�イント %(mountpoint)s を切断(detach)����"
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -10115,24 +10148,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "プライベートキー�復��失敗����: %s"
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr "例外 %s �発生����。"
@@ -10269,72 +10302,72 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "インスタンス %s �VBD�見��り��ん。"
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "グループ %s �既�存在�����。"
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "VBD %s � unplug �失敗����。"
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "VBD %s �削除�失敗����。"
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "VM %(vm_ref)s, VDI %(vdi_ref)s 用仮想ブロックデ�イス(VBD) %(vbd_ref)s を作�����。"
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "VM %(vm_ref)s, VDI %(vdi_ref)s 用仮想ブロックデ�イス(VBD) %(vbd_ref)s を作�����。"
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -10343,305 +10376,305 @@ msgstr ""
 "%(sr_ref)s 上� VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, "
 "%(read_only)s) を作�����。"
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "VM %s �対�るスナップショットを開始���。"
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, fuzzy, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr "ID %(image_id)s ��� %(vdi_uuids)s �アップロード�為� xapi を����������"
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "イメージ %(image_location)s � ID %(image_id)s �登録�れ���"
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "イメージ %(image)s �サイズ:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "ドメイン0 上� /boot/guest � VDI %s をコピー中"
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "カー�ル/RAMディスク VDI %s �削除�れ���"
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "PV kernel�vdi %s を�得���。"
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s ��然���存在�����。"
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "SR %s を�スキャン���。"
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s �親� %(parent_ref)s ��"
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr "親 %(parent_uuid)s �元々�親 %(original_parent_uuid)s �一致���ん。作�を待機�����…"
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "VBD %s を接続�����… "
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "仮想ブロックデ�イス(VBD) %s �接続�完了����。"
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "VDI %s 用�仮想ブロックデ�イス(VBD)を削除�����… "
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "VDI %s 用�仮想ブロックデ�イス(VBD)�削除�完了����。"
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "%s �対�� pygrub を実行�����"
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Xen Kernel %s �見��り���。"
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 "No Xen kernel found.  Booting HVM.\r\n"
 "Xen 用カー�ル�見��り��ん。完全仮想化モード(HVM)�起動�����。"
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10649,55 +10682,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "パーティションテーブル %s �書�込��完了����。"
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -10711,199 +10751,209 @@ msgstr "%s 用�ブリッジインタフェースを開始���。"
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 #, fuzzy
 msgid "Starting instance"
 msgstr "raw instanceを生����。"
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 #, fuzzy
 msgid "Starting VM"
 msgstr "xvp を�起動�����"
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "VM %s �スナップショット�アップロード�完了����。"
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+#, fuzzy
+msgid "Unable to terminate instance."
+msgstr "インスタンス終了処�を開始���。"
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 #, fuzzy
 msgid "Destroying VDIs"
 msgstr "xvp を�起動�����"
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr "カー�ル/RAMディスクファイル�削除�れ���"
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 #, fuzzy
 msgid "Destroying VM"
 msgstr "xvp を�起動�����"
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "�ットワークホスト�設定を���。"
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "VM %(vm_ref)s, network %(network_ref)s 用仮想インターフェース(VIF)を作������。"
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "VM %(vm_ref)s, network %(network_ref)s 用仮想インターフェース(VIF)を作������。"
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -11032,16 +11082,25 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 msgid "status must be 'in-use'"
 msgstr ""
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr "インスタンス終了処�を開始���。"
+
diff --git a/nova/locale/ko/LC_MESSAGES/nova.po b/nova/locale/ko/LC_MESSAGES/nova.po
index a6463b245..e12904c36 100644
--- a/nova/locale/ko/LC_MESSAGES/nova.po
+++ b/nova/locale/ko/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+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"
@@ -83,7 +83,7 @@ msgstr "플래그 경로: %s"
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -167,8 +167,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -198,7 +198,7 @@ msgstr ""
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
@@ -1235,55 +1235,67 @@ msgstr ""
 
 #: nova/exception.py:1157
 #, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1294,7 +1306,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1314,205 +1326,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-msgid "Full set of CONF:"
-msgstr ""
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, python-format
-msgid "Starting %d workers"
-msgstr ""
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1597,130 +1529,125 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
@@ -1730,69 +1657,74 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, python-format
+msgid "Invalid IP protocol %s."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
@@ -1801,7 +1733,7 @@ msgstr ""
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
@@ -1811,7 +1743,7 @@ msgid "Detach Volume Failed."
 msgstr ""
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
@@ -1843,137 +1775,137 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2013,11 +1945,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, fuzzy, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
@@ -2036,19 +1968,19 @@ msgstr ""
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -2060,63 +1992,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:364
+#: nova/api/openstack/common.py:366
 #, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -2170,14 +2102,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
 #: nova/api/openstack/extensions.py:370
 #, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2220,13 +2152,13 @@ msgstr ""
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr ""
 
@@ -2235,20 +2167,20 @@ msgstr ""
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, python-format
 msgid "Calling method %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2261,12 +2193,12 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2274,17 +2206,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2349,210 +2281,210 @@ msgstr ""
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, python-format
 msgid "Flavor '%s' could not be found "
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2560,9 +2492,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
+#: nova/api/openstack/compute/servers.py:1408
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+msgid "Removing options '%s' from query"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2649,7 +2581,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2669,17 +2601,17 @@ msgstr "compute.api::resume %s"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2834,15 +2766,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
@@ -2951,7 +2883,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -2984,29 +2916,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3225,33 +3157,33 @@ msgstr ""
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, fuzzy, python-format
 msgid "Instance %s is not attached."
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3270,94 +3202,94 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, fuzzy, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
-msgstr "�스턴스 %s: 스냅샷 저장중"
+msgid "Got update for instance: %(instance)s"
+msgstr "%(instance_name)s �스턴스� %(mountpoint)s 마운트지�� 장착�었습니다"
 
-#: nova/cells/messaging.py:838
+#: nova/cells/messaging.py:862
 #, fuzzy, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+msgid "Got update to delete instance"
 msgstr "%(instance_name)s �스턴스� %(mountpoint)s 마운트지�� 장착�었습니다"
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3374,7 +3306,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3388,7 +3320,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3414,7 +3346,7 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, fuzzy, python-format
 msgid "Failed to load %s"
 msgstr "%s 볼륨� 찾�수 없습니다"
@@ -3434,271 +3366,271 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 #, fuzzy
 msgid "instance"
 msgstr "�스턴스 %s를 재부팅합니다"
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3778,243 +3710,243 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "%s 볼륨� 찾�수 없습니다"
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4048,722 +3980,727 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "�스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "�스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "%s 볼륨 탈착� 실패했습니다"
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "�스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "�스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, fuzzy, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, python-format
 msgid "Host %(host)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -4873,7 +4810,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -4884,7 +4821,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -4962,54 +4899,50 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5026,51 +4959,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5155,15 +5088,19 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 msgid "Failed storing info cache"
 msgstr ""
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -5277,103 +5214,103 @@ msgstr ""
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5468,38 +5405,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5534,7 +5471,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5616,65 +5553,65 @@ msgstr ""
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5691,27 +5628,27 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5721,17 +5658,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5804,11 +5741,91 @@ msgstr ""
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+msgid "Full set of CONF:"
+msgstr ""
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr ""
@@ -5947,57 +5964,62 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -6311,7 +6333,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6320,36 +6342,48 @@ msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, fuzzy, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr "%(instance_name)s �스턴스� %(mountpoint)s 마운트지�� 장착�었습니다"
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:357
+#: nova/scheduler/filter_scheduler.py:361
 #, python-format
-msgid "Choosing host %(chosen_host)s"
+msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6544,46 +6578,46 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 msgid "memcached_servers not defined"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6636,58 +6670,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr ""
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 msgid "fake vswitch not found"
 msgstr ""
@@ -6721,17 +6739,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6740,7 +6758,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
@@ -6757,16 +6775,16 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 msgid "spawn error"
 msgstr ""
 
@@ -6862,6 +6880,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -6886,11 +6920,10 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -7015,19 +7048,19 @@ msgstr ""
 "Stdout: %(stdout)r\n"
 "Stderr: %(stderr)r"
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7195,15 +7228,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7261,97 +7294,97 @@ msgstr ""
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7686,7 +7719,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7700,24 +7733,24 @@ msgstr ""
 msgid "Host IP address is: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8040,12 +8073,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8210,7 +8243,7 @@ msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8278,201 +8311,201 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8480,73 +8513,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "%s 볼륨 탈착� 실패했습니다"
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8554,50 +8587,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8607,67 +8640,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8700,153 +8733,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, python-format
 msgid "Writing stored info to %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -8959,87 +8992,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9112,35 +9145,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
@@ -9231,74 +9264,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, fuzzy, python-format
 msgid "LPAR instance '%s' not found"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, fuzzy, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr "�스턴스 %s를 재부팅합니다"
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, fuzzy, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr "�스턴스 %s를 재부팅합니다"
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, python-format
 msgid "Instance '%s' failed to boot"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, fuzzy, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, python-format
 msgid "Shutting down the instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9754,7 +9787,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -9914,19 +9947,19 @@ msgstr "%s 볼륨 탈착� 실패했습니다"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "%(instance_name)s �스턴스� %(mountpoint)s 마운트지�� 탈착�었습니다"
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -10030,24 +10063,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -10184,374 +10217,374 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10559,55 +10592,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -10621,194 +10661,204 @@ msgstr ""
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 #, fuzzy
 msgid "Starting instance"
 msgstr "�스턴스 %s를 재부팅합니다"
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+#, fuzzy
+msgid "Unable to terminate instance."
+msgstr "�스턴스 %s를 재부팅합니다"
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -10936,16 +10986,25 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 msgid "status must be 'in-use'"
 msgstr ""
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr "�스턴스 %s: 스냅샷 저장중"
+
diff --git a/nova/locale/ko_KR/LC_MESSAGES/nova.po b/nova/locale/ko_KR/LC_MESSAGES/nova.po
index 423155ebe..a426ca671 100644
--- a/nova/locale/ko_KR/LC_MESSAGES/nova.po
+++ b/nova/locale/ko_KR/LC_MESSAGES/nova.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+0000\n"
 "PO-Revision-Date: 2013-05-06 16:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: en_US <LL@li.org>\n"
@@ -84,7 +84,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -168,8 +168,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr "Keypair ��터가 맞지 않습니다"
 
@@ -199,7 +199,7 @@ msgstr ""
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
@@ -1235,55 +1235,67 @@ msgstr ""
 
 #: nova/exception.py:1157
 #, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1294,7 +1306,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1314,205 +1326,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-msgid "Full set of CONF:"
-msgstr ""
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, python-format
-msgid "Starting %d workers"
-msgstr ""
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1597,130 +1529,125 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
@@ -1730,69 +1657,74 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, python-format
+msgid "Invalid IP protocol %s."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
@@ -1801,7 +1733,7 @@ msgstr ""
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
@@ -1811,7 +1743,7 @@ msgid "Detach Volume Failed."
 msgstr ""
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
@@ -1843,137 +1775,137 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2013,11 +1945,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr ""
@@ -2036,19 +1968,19 @@ msgstr ""
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -2060,63 +1992,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:364
+#: nova/api/openstack/common.py:366
 #, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -2170,14 +2102,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
 #: nova/api/openstack/extensions.py:370
 #, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2220,13 +2152,13 @@ msgstr ""
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr ""
 
@@ -2235,20 +2167,20 @@ msgstr ""
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, python-format
 msgid "Calling method %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2261,12 +2193,12 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2274,17 +2206,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2349,210 +2281,210 @@ msgstr ""
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, python-format
 msgid "Flavor '%s' could not be found "
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2560,9 +2492,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
+#: nova/api/openstack/compute/servers.py:1408
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+msgid "Removing options '%s' from query"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2649,7 +2581,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2669,17 +2601,17 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2831,15 +2763,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
@@ -2947,7 +2879,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -2980,29 +2912,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3221,33 +3153,33 @@ msgstr ""
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, python-format
 msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3266,94 +3198,94 @@ msgstr "주소 릴리즈 %s"
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:838
-#, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
-msgstr ""
+#: nova/cells/messaging.py:862
+#, fuzzy
+msgid "Got update to delete instance"
+msgstr "�스턴스 재시작 실패"
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3370,7 +3302,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3384,7 +3316,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3410,7 +3342,7 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, python-format
 msgid "Failed to load %s"
 msgstr ""
@@ -3430,270 +3362,270 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3773,242 +3705,242 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4042,714 +3974,719 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, python-format
 msgid "Host %(host)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -4859,7 +4796,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -4870,7 +4807,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -4948,54 +4885,50 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5012,51 +4945,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5141,15 +5074,19 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 msgid "Failed storing info cache"
 msgstr ""
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -5263,103 +5200,103 @@ msgstr ""
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5454,38 +5391,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5520,7 +5457,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5602,65 +5539,65 @@ msgstr ""
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5677,27 +5614,27 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5707,17 +5644,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5790,11 +5727,91 @@ msgstr ""
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+msgid "Full set of CONF:"
+msgstr ""
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr ""
@@ -5933,57 +5950,62 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -6297,7 +6319,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6306,36 +6328,48 @@ msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:357
+#: nova/scheduler/filter_scheduler.py:361
 #, python-format
-msgid "Choosing host %(chosen_host)s"
+msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6530,46 +6564,46 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 msgid "memcached_servers not defined"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6622,58 +6656,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr ""
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 msgid "fake vswitch not found"
 msgstr ""
@@ -6707,17 +6725,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6726,7 +6744,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
@@ -6743,16 +6761,16 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 msgid "spawn error"
 msgstr ""
 
@@ -6848,6 +6866,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -6872,11 +6906,10 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -6996,19 +7029,19 @@ msgstr ""
 msgid "ipmitool stdout: '%(out)s', stderr: '%(err)s'"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7176,15 +7209,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7242,97 +7275,97 @@ msgstr ""
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7666,7 +7699,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7680,24 +7713,24 @@ msgstr ""
 msgid "Host IP address is: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8018,12 +8051,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8181,7 +8214,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8249,201 +8282,201 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8451,73 +8484,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8525,50 +8558,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8578,67 +8611,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8671,153 +8704,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, python-format
 msgid "Writing stored info to %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -8930,87 +8963,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9082,35 +9115,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
@@ -9201,74 +9234,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, python-format
 msgid "LPAR instance '%s' not found"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, python-format
 msgid "Instance '%s' failed to boot"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, python-format
 msgid "Shutting down the instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9724,7 +9757,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -9882,19 +9915,19 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -9998,24 +10031,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -10152,374 +10185,374 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10527,55 +10560,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -10589,193 +10629,203 @@ msgstr ""
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+#, fuzzy
+msgid "Unable to terminate instance."
+msgstr "�스턴스 재시작 실패"
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -10903,16 +10953,28 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 msgid "status must be 'in-use'"
 msgstr ""
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr ""
+
+#~ msgid "Got update to delete instance %(instance_uuid)s"
+#~ msgstr ""
+
diff --git a/nova/locale/nb/LC_MESSAGES/nova.po b/nova/locale/nb/LC_MESSAGES/nova.po
index d75e603d6..2c984fc21 100644
--- a/nova/locale/nb/LC_MESSAGES/nova.po
+++ b/nova/locale/nb/LC_MESSAGES/nova.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+0000\n"
 "PO-Revision-Date: 2012-09-13 10:30+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: nb <LL@li.org>\n"
@@ -85,7 +85,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr "En ukjent feil oppsto."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -169,8 +169,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -200,7 +200,7 @@ msgstr ""
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Ugyldig IP protokoll %(protocol)s."
@@ -1236,55 +1236,67 @@ msgstr ""
 
 #: nova/exception.py:1157
 #, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1295,7 +1307,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1315,205 +1327,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-msgid "Full set of CONF:"
-msgstr ""
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, python-format
-msgid "Starting %d workers"
-msgstr ""
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr "Resultat var %s"
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Forventet objekt av typen: %s"
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, fuzzy, python-format
 msgid "%s is not a string or unicode"
 msgstr "Tjenernavn er ikke en streng eller unicode"
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1598,130 +1530,125 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr "Signatur ikke gitt"
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
@@ -1731,69 +1658,74 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr "Lag nøkkelpar %s"
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr "Importer nøkkel %s"
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Slett nøkkelpar %s"
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, fuzzy, python-format
+msgid "Invalid IP protocol %s."
+msgstr "Ugyldig IP protokoll %(protocol)s."
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr "Ingen regel for de angitte parametrene."
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
@@ -1802,7 +1734,7 @@ msgstr ""
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
@@ -1812,7 +1744,7 @@ msgid "Detach Volume Failed."
 msgstr ""
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
@@ -1844,137 +1776,137 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr "bruker eller gruppe ikke spesifisert"
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr "kun gruppe \"all\" er støttet"
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2015,11 +1947,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, fuzzy, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr "Kunne ikke hente metadata for ip:% s"
@@ -2038,19 +1970,19 @@ msgstr ""
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -2062,63 +1994,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:364
+#: nova/api/openstack/common.py:366
 #, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -2172,14 +2104,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "Kunne ikke laste utvidelse %(ext_factory)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "Kunne ikke laste utvidelse %(classpath)s: %(exc)s"
 
 #: nova/api/openstack/extensions.py:370
-#, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+#, fuzzy, python-format
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr "Kunne ikke laste utvidelse %(ext_name)s: %(exc)s"
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2222,13 +2154,13 @@ msgstr ""
 msgid "There is no such action: %s"
 msgstr "Ingen slik handling: %s"
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr ""
 
@@ -2237,20 +2169,20 @@ msgstr ""
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, python-format
 msgid "Calling method %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2263,12 +2195,12 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2276,17 +2208,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2351,211 +2283,211 @@ msgstr "Tjener eksisterer ikke"
 msgid "Metadata item was not found"
 msgstr "Metadata element ble ikke funnet"
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, fuzzy, python-format
 msgid "Flavor '%s' could not be found "
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr "Feil nettverks-format: mangler %s"
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr "Feil nettverks-format"
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr "Tjenernavn er ikke definert"
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "Ressurs ble ikke funnet."
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2563,9 +2495,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
+#: nova/api/openstack/compute/servers.py:1408
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+msgid "Removing options '%s' from query"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2652,7 +2584,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2672,17 +2604,17 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2835,15 +2767,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
@@ -2952,7 +2884,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -2985,29 +2917,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3229,33 +3161,33 @@ msgstr ""
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, python-format
 msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3274,94 +3206,93 @@ msgstr "Frigjør adresse %s"
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, fuzzy, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr "Kunne ikke laste utvidelse %(ext_factory)s: %(exc)s"
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
-#, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
-msgstr ""
+#: nova/cells/messaging.py:819
+#, fuzzy, python-format
+msgid "Got update for instance: %(instance)s"
+msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/cells/messaging.py:838
-#, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+#: nova/cells/messaging.py:862
+msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3378,7 +3309,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3392,7 +3323,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3418,7 +3349,7 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, fuzzy, python-format
 msgid "Failed to load %s"
 msgstr "Kan ikke finne adressen %r"
@@ -3438,272 +3369,272 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 #, fuzzy
 msgid "IP address"
 msgstr "Tildel adresse"
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 #, fuzzy
 msgid "No networks found"
 msgstr "Nettverk ikke funnet"
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3783,242 +3714,242 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4052,714 +3983,719 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, fuzzy, python-format
 msgid "Host %(host)s not found"
 msgstr "Nettverk ikke funnet"
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Kunne ikke hente metadata for ip:% s"
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -4869,7 +4805,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -4880,7 +4816,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -4958,54 +4894,50 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5022,51 +4954,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5151,15 +5083,19 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 msgid "Failed storing info cache"
 msgstr ""
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -5273,103 +5209,103 @@ msgstr ""
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5464,38 +5400,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5531,7 +5467,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5614,65 +5550,65 @@ msgstr ""
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5689,27 +5625,27 @@ msgstr "Denne regelen eksisterer allerede i gruppen %s"
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5719,17 +5655,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5802,11 +5738,91 @@ msgstr ""
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr "Resultat var %s"
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r feilet. Prøver på nytt."
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+msgid "Full set of CONF:"
+msgstr ""
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr ""
@@ -5945,57 +5961,62 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -6310,7 +6331,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6319,36 +6340,48 @@ msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:357
+#: nova/scheduler/filter_scheduler.py:361
 #, python-format
-msgid "Choosing host %(chosen_host)s"
+msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6543,47 +6576,47 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 #, fuzzy
 msgid "memcached_servers not defined"
 msgstr "Tjenernavn er ikke definert"
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6636,58 +6669,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr ""
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 #, fuzzy
 msgid "fake vswitch not found"
@@ -6722,17 +6739,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6741,7 +6758,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
@@ -6758,16 +6775,16 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 msgid "spawn error"
 msgstr ""
 
@@ -6863,6 +6880,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -6887,11 +6920,10 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -7012,19 +7044,19 @@ msgstr ""
 msgid "ipmitool stdout: '%(out)s', stderr: '%(err)s'"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7193,15 +7225,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7259,97 +7291,97 @@ msgstr ""
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7683,7 +7715,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7697,24 +7729,24 @@ msgstr ""
 msgid "Host IP address is: %s"
 msgstr "Frigjør adresse %s"
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8035,12 +8067,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8198,7 +8230,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8266,203 +8298,203 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Ingen nettverk definert."
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Ingen nettverk definert."
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8470,73 +8502,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8544,50 +8576,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8597,67 +8629,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8690,153 +8722,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, python-format
 msgid "Writing stored info to %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -8949,87 +8981,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, fuzzy, python-format
 msgid "AoE device not found at %s"
 msgstr "Tjener ikke funnet"
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9101,35 +9133,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
@@ -9220,74 +9252,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, python-format
 msgid "LPAR instance '%s' not found"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, python-format
 msgid "Instance '%s' failed to boot"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, python-format
 msgid "Shutting down the instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9743,7 +9775,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -9903,19 +9935,19 @@ msgstr "Kan ikke finne adressen %r"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -10019,24 +10051,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -10173,375 +10205,375 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 #, fuzzy
 msgid "SR not present and could not be introduced"
 msgstr "Prosjekt %(project_id)s ble ikke funnet."
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10549,55 +10581,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -10611,194 +10650,203 @@ msgstr ""
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+msgid "Unable to terminate instance."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 #, fuzzy
 msgid "No suitable network for migrate"
 msgstr "Feil nettverks-format"
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -10926,16 +10974,28 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 msgid "status must be 'in-use'"
 msgstr ""
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr ""
+
+#~ msgid "Got update to delete instance %(instance_uuid)s"
+#~ msgstr ""
+
diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index 0879981bc..02087978d 100644
--- a/nova/locale/nova.pot
+++ b/nova/locale/nova.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: nova jenkins.nova.propose.translation.update.246\n"
+"Project-Id-Version: nova jenkins.nova.propose.translation.update.254\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+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"
@@ -83,7 +83,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -167,8 +167,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -198,7 +198,7 @@ msgstr ""
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
@@ -1234,55 +1234,67 @@ msgstr ""
 
 #: nova/exception.py:1157
 #, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1293,7 +1305,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1313,205 +1325,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-msgid "Full set of CONF:"
-msgstr ""
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, python-format
-msgid "Starting %d workers"
-msgstr ""
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1596,130 +1528,125 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
@@ -1729,69 +1656,74 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, python-format
+msgid "Invalid IP protocol %s."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
@@ -1800,7 +1732,7 @@ msgstr ""
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
@@ -1810,7 +1742,7 @@ msgid "Detach Volume Failed."
 msgstr ""
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
@@ -1842,137 +1774,137 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2012,11 +1944,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr ""
@@ -2035,19 +1967,19 @@ msgstr ""
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -2059,63 +1991,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:364
+#: nova/api/openstack/common.py:366
 #, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -2169,14 +2101,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
 #: nova/api/openstack/extensions.py:370
 #, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2219,13 +2151,13 @@ msgstr ""
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr ""
 
@@ -2234,20 +2166,20 @@ msgstr ""
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, python-format
 msgid "Calling method %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2260,12 +2192,12 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2273,17 +2205,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2348,210 +2280,210 @@ msgstr ""
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, python-format
 msgid "Flavor '%s' could not be found "
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2559,9 +2491,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
+#: nova/api/openstack/compute/servers.py:1408
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+msgid "Removing options '%s' from query"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2648,7 +2580,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2668,17 +2600,17 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2830,15 +2762,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
@@ -2946,7 +2878,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -2979,29 +2911,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3220,33 +3152,33 @@ msgstr ""
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, python-format
 msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3265,94 +3197,93 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:838
-#, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+#: nova/cells/messaging.py:862
+msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3369,7 +3300,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3383,7 +3314,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3409,7 +3340,7 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, python-format
 msgid "Failed to load %s"
 msgstr ""
@@ -3429,270 +3360,270 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3772,242 +3703,242 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4041,714 +3972,719 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, python-format
 msgid "Host %(host)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -4858,7 +4794,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -4869,7 +4805,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -4947,54 +4883,50 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5011,51 +4943,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5140,15 +5072,19 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 msgid "Failed storing info cache"
 msgstr ""
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -5262,103 +5198,103 @@ msgstr ""
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5453,38 +5389,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5519,7 +5455,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5601,65 +5537,65 @@ msgstr ""
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5676,27 +5612,27 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5706,17 +5642,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5789,11 +5725,91 @@ msgstr ""
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+msgid "Full set of CONF:"
+msgstr ""
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr ""
@@ -5932,57 +5948,62 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -6296,7 +6317,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6305,36 +6326,48 @@ msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:357
+#: nova/scheduler/filter_scheduler.py:361
 #, python-format
-msgid "Choosing host %(chosen_host)s"
+msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6529,46 +6562,46 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 msgid "memcached_servers not defined"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6621,58 +6654,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr ""
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 msgid "fake vswitch not found"
 msgstr ""
@@ -6706,17 +6723,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6725,7 +6742,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
@@ -6742,16 +6759,16 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 msgid "spawn error"
 msgstr ""
 
@@ -6847,6 +6864,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -6871,11 +6904,10 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -6995,19 +7027,19 @@ msgstr ""
 msgid "ipmitool stdout: '%(out)s', stderr: '%(err)s'"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7175,15 +7207,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7241,97 +7273,97 @@ msgstr ""
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7665,7 +7697,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7679,24 +7711,24 @@ msgstr ""
 msgid "Host IP address is: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8017,12 +8049,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8180,7 +8212,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8248,201 +8280,201 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8450,73 +8482,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8524,50 +8556,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8577,67 +8609,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8670,153 +8702,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, python-format
 msgid "Writing stored info to %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -8929,87 +8961,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9081,35 +9113,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
@@ -9200,74 +9232,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, python-format
 msgid "LPAR instance '%s' not found"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, python-format
 msgid "Instance '%s' failed to boot"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, python-format
 msgid "Shutting down the instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9723,7 +9755,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -9881,19 +9913,19 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -9997,24 +10029,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -10151,374 +10183,374 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10526,55 +10558,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -10588,193 +10627,202 @@ msgstr ""
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+msgid "Unable to terminate instance."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -10902,16 +10950,16 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 msgid "status must be 'in-use'"
 msgstr ""
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 msgid "status must be 'available'"
 msgstr ""
 
diff --git a/nova/locale/pt_BR/LC_MESSAGES/nova.po b/nova/locale/pt_BR/LC_MESSAGES/nova.po
index 463375c36..f871f48e4 100644
--- a/nova/locale/pt_BR/LC_MESSAGES/nova.po
+++ b/nova/locale/pt_BR/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+0000\n"
 "PO-Revision-Date: 2012-05-04 19:25+0000\n"
 "Last-Translator: Júlio Cezar Santos Pires <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -84,7 +84,7 @@ msgstr "Localização dos sinalizadores: %s"
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -168,8 +168,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -200,7 +200,7 @@ msgstr "Assinatura inválida para usuário %s"
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Sequencia de porta %(from_port)s:%(to_port)s é inválida. %(msg)s"
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Protocolo IP %(protocol)s é inválido."
@@ -1239,56 +1239,68 @@ msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
 #: nova/exception.py:1157
+#, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "A instância %(instance_id)s não está executando."
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1299,7 +1311,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1320,206 +1332,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-#, fuzzy
-msgid "Full set of CONF:"
-msgstr "Conjunto completo de FLAGS:"
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, python-format
-msgid "Starting %d workers"
-msgstr ""
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "Encerrado serviço que não tem entrada na base de dados"
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr "Executando o comando (SSH): %s"
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr "Ambiente não suportado por SSH"
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr "Resultado foi %s"
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr "depuração em retorno de chamada: %s"
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Endereço para Link Local não encontrado: %s"
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Não foi possível atribuir um IP para o Link Local de %(interface)s :%(ex)s"
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Backend inválido: %s"
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Objeto esperado do tipo: %s"
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1604,131 +1535,126 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr "Muitas falhas de autenticação."
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "Falha de Autenticação: %s"
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "Muitas falhas de autenticação."
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr "ação: %s"
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "NotFound lançado: %s"
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "Erro inexperado lançado: %s"
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Erro inexperado lançado: %s"
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "Ocorreu um erro desconhecido. Por favor tente sua requisição novamente."
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
@@ -1738,69 +1664,74 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr "Criar par de chaves %s"
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Remover par de chaves %s"
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, fuzzy, python-format
+msgid "Invalid IP protocol %s."
+msgstr "Protocolo IP %(protocol)s é inválido."
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr "Não existe regra para os parâmetros especificados"
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Esta regra já existe no grupo %s"
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Criar volume de %s GB"
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
@@ -1809,7 +1740,7 @@ msgstr ""
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Desanexar volume %s"
@@ -1820,7 +1751,7 @@ msgid "Detach Volume Failed."
 msgstr "Desanexar volume %s"
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "atributo não suportado: %s"
@@ -1852,140 +1783,140 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Desatribuir endereço %s"
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Desatribuir endereço %s"
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Desatribuir endereço %s"
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr "Começando a terminar instâncias"
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reiniciar instância %r"
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr "Removendo o registro da imagem %s"
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr "usuário ou grupo não especificado"
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr "apenas o grupo \"all\" é suportado"
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr "operation_type deve ser add ou remove"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Atualizando publicidade da imagem %s"
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "Instância não existe"
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2026,11 +1957,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, fuzzy, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr "Falha ao obter metadados para o ip: %s"
@@ -2049,19 +1980,19 @@ msgstr ""
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -2073,63 +2004,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:364
+#: nova/api/openstack/common.py:366
 #, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -2183,14 +2114,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
 #: nova/api/openstack/extensions.py:370
 #, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2233,13 +2164,13 @@ msgstr ""
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr "Corpo do pedido está mal formado"
 
@@ -2248,20 +2179,20 @@ msgstr "Corpo do pedido está mal formado"
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, fuzzy, python-format
 msgid "Calling method %s"
 msgstr "Chamando o pai %s"
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2274,12 +2205,12 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2287,17 +2218,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, fuzzy, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr "Assinatura inválida para usuário %s"
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, fuzzy, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr "Assinatura inválida para usuário %s"
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2362,215 +2293,215 @@ msgstr ""
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 #, fuzzy
 msgid "Only administrators may list deleted instances"
 msgstr "Começando a terminar instâncias"
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, fuzzy, python-format
 msgid "Flavor '%s' could not be found "
 msgstr "Host %(host)s não encontrado."
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "Ponto de montagem não pode ser traduzido: %s"
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "Ponto de montagem não pode ser traduzido: %s"
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "Serviço %(service_id)s não encontrado."
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2578,9 +2509,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
+#: nova/api/openstack/compute/servers.py:1408
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+msgid "Removing options '%s' from query"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2667,7 +2598,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2687,17 +2618,17 @@ msgstr "compute.api::resume %s"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2854,15 +2785,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
@@ -2974,7 +2905,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "Volume não encontrada para a instância %(instance_id)s."
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3008,29 +2939,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Chamando o pai %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Chamando o pai %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3257,33 +3188,33 @@ msgstr "vol=%s"
 msgid "Delete volume with id: %s"
 msgstr "Remover volume com id: %s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, fuzzy, python-format
 msgid "Instance %s is not attached."
 msgstr "Instância %s não encontrada"
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3302,94 +3233,94 @@ msgstr "Liberar endereço %s"
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "sem método para mensagem: %s"
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "sem método para mensagem: %s"
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, fuzzy, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
-msgstr "A instância %(instance_id)s não está executando."
+msgid "Got update for instance: %(instance)s"
+msgstr "Volume não encontrada para a instância %(instance_id)s."
 
-#: nova/cells/messaging.py:838
+#: nova/cells/messaging.py:862
 #, fuzzy, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+msgid "Got update to delete instance"
 msgstr "Volume não encontrada para a instância %(instance_id)s."
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3406,7 +3337,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "Volume não encontrada para a instância %(instance_id)s."
@@ -3420,7 +3351,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3447,7 +3378,7 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr "Executando VPN para %s"
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, fuzzy, python-format
 msgid "Failed to load %s"
 msgstr "Não foi possível criar volume"
@@ -3467,278 +3398,278 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 #, fuzzy
 msgid "Reserved"
 msgstr "recebido %s"
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 #, fuzzy
 msgid "network"
 msgstr "instância %s: reset da rede"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 #, fuzzy
 msgid "IP address"
 msgstr "Alocar endereço"
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "group %s já existe"
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 #, fuzzy
 msgid "No networks found"
 msgstr "Nenhuma rede definida."
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "%(req)s é necessário para criar a rede."
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 #, fuzzy
 msgid "instance"
 msgstr "Reiniciar instância %r"
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "Serviço %(service_id)s não encontrado."
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "Serviço %(service_id)s não encontrado."
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "Erro inexperado lançado: %s"
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3819,250 +3750,250 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Não é possível anexar o volume na instância %s"
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Criar Grupo de Segurança %s"
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Não é possível destruir o VBD %s"
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revogado entrada do grupo de segurança %s"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Autorizada entrada do grupo de segurança %s"
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revogado entrada do grupo de segurança %s"
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4097,733 +4028,738 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Falha ao suspender instância"
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Erro inexperado lançado: %s"
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Reconstruindo instância %s"
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Desanexar volume %s"
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Reiniciando a instância %s"
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "Reconstruindo instância %s"
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instância %s: fazendo um snapshot"
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr "Removendo imagem %s"
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 #, fuzzy
 msgid "error setting admin password"
 msgstr "Configurar senha do administrador"
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Falha ao suspender instância"
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instância %s: desfazendo o resgate"
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instância não existe"
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instância %s: recuperando os diagnósticos"
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 #, fuzzy
 msgid "Reset network"
 msgstr "instância %s: reset da rede"
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 #, fuzzy
 msgid "Get console output"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Adicionando console"
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Adicionando console"
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Desconectando volume da instância desconhecida %s"
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, fuzzy, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr "Rede %(network_id)s não foi encontrada."
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, fuzzy, python-format
 msgid "Host %(host)s not found"
 msgstr "Host %(host)s não encontrado."
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Falha ao obter metadados para o ip: %s"
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Remover volume com id: %s"
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "Instância %s não encontrada"
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Removendo imagem %s"
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, fuzzy, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr "Iniciando instância %s"
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -4933,7 +4869,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -4944,7 +4880,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5023,56 +4959,52 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 #, fuzzy
 msgid "Failed to notify cells of instance update"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 #, fuzzy
 msgid "Failed to notify cells of instance fault"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "Corpo do pedido está mal formado"
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5089,51 +5021,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5218,16 +5150,20 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 #, fuzzy
 msgid "Failed storing info cache"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, fuzzy, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr "Volume não encontrada para a instância %(instance_id)s."
@@ -5341,103 +5277,103 @@ msgstr ""
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, fuzzy, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr "Pid %d está ultrapassado, reiniciando dnsmasq"
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d está ultrapassado, reiniciando dnsmasq"
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d está ultrapassado, reiniciando radvd"
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "Backend inválido: %s"
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Iniciando a VLAN %s"
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Iniciando instância %s"
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "Interface %(interface)s não encontrada."
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Falha ao suspender instância"
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Iniciando instância %s"
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Removendo o registro da imagem %s"
@@ -5532,38 +5468,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr "Rede já existe!"
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5599,7 +5535,7 @@ msgstr "_remover: %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5682,68 +5618,68 @@ msgstr "Removendo rede com id %s"
 msgid "Quantum Error creating security group %s"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Revogado entrada do grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Capturado o erro: %s"
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Autorizada entrada do grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5760,27 +5696,27 @@ msgstr "Esta regra já existe no grupo %s"
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5790,17 +5726,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr "_remover: %s"
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, fuzzy, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr "Classe %(fullname)s está obsoleta: %(msg)s"
@@ -5873,11 +5809,92 @@ msgstr ""
 msgid "Running cmd (subprocess): %s"
 msgstr "Executando comando (subprocesso): %s"
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr "Resultado foi %s"
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r falhou. Tentando novamente."
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr "Executando o comando (SSH): %s"
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr "Ambiente não suportado por SSH"
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+#, fuzzy
+msgid "Full set of CONF:"
+msgstr "Conjunto completo de FLAGS:"
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr ""
@@ -6016,57 +6033,62 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr "Reutilização inválida de uma conexão RPC."
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Retornando exceção %s ao método de origem"
@@ -6386,7 +6408,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6395,36 +6417,48 @@ msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, fuzzy, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr "Volume não encontrada para a instância %(instance_id)s."
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:357
+#: nova/scheduler/filter_scheduler.py:361
 #, python-format
-msgid "Choosing host %(chosen_host)s"
+msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6619,46 +6653,46 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr "Recuperada conexão servidor de modelo."
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr "servidor de modelo perdido"
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 msgid "memcached_servers not defined"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6711,58 +6745,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr "Tentativa de instanciar singleton"
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 #, fuzzy
 msgid "fake vswitch not found"
@@ -6797,17 +6815,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6816,7 +6834,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
@@ -6833,16 +6851,16 @@ msgstr ""
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 msgid "spawn error"
 msgstr ""
 
@@ -6938,6 +6956,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -6962,11 +6996,11 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+#, fuzzy
+msgid "Unable to load the virtualization driver"
 msgstr "Não foi possível carregar o driver de virtualização: %s"
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -7093,19 +7127,19 @@ msgstr ""
 "Saída padrão: %(stdout)r\n"
 "Erro: %(stderr)r"
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7274,15 +7308,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7340,97 +7374,97 @@ msgstr "nenhuma partição encontrada"
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, fuzzy, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr "Falhou em montar sistema de arquivo: %s"
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, fuzzy, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr "Falhou em montar sistema de arquivo: %s"
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7767,7 +7801,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7782,24 +7816,24 @@ msgstr "Obter saída do console para instância %s"
 msgid "Host IP address is: %s"
 msgstr "Liberar endereço %s"
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8123,12 +8157,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8294,7 +8328,7 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8362,209 +8396,209 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Nenhuma rede definida."
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Nenhuma rede definida."
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: criado com sucesso"
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Usuário não tem privilégios de administrador"
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 "Solicitando à xapi para realizar upload da imagem %(vdi_uuids)s com ID "
 "%(image_id)s"
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8572,73 +8606,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Obtendo o tamanho da imagem para a imagem %s"
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8646,50 +8680,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8699,67 +8733,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "Falha de Autenticação: %s"
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8792,153 +8826,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, fuzzy, python-format
 msgid "Writing stored info to %s"
 msgstr "Iniciando a Bridge para %s"
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -9051,87 +9085,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, fuzzy, python-format
 msgid "%s is already mounted"
 msgstr "group %s já existe"
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9205,35 +9239,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, fuzzy, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr "Executando comando (subprocesso): %s"
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
@@ -9324,74 +9358,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, fuzzy, python-format
 msgid "LPAR instance '%s' not found"
 msgstr "Instância não encontrada"
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, fuzzy, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr "Iniciando a Bridge para %s"
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, fuzzy, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr "Iniciando instância %s"
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, fuzzy, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr "Iniciando instância %s"
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, python-format
 msgid "Instance '%s' failed to boot"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, fuzzy, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr "instância %s: fazendo um snapshot"
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, fuzzy, python-format
 msgid "Shutting down the instance '%s'"
 msgstr "Começando a terminar instâncias"
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, fuzzy, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr "Começando a terminar instâncias"
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9852,7 +9886,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -10012,19 +10046,19 @@ msgstr "Não foi possível criar volume"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Ponto de montagem %(mountpoint)s desanexada da instância %(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -10128,24 +10162,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -10284,73 +10318,73 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 #, fuzzy
 msgid "Created VM"
 msgstr "_criar: %s"
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "O VBD não foi encontrado na instância %s"
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "group %s já existe"
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Não é possível desconectar o VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Não é possível destruir o VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "VBD %(vbd_ref)s criado para VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "VBD %(vbd_ref)s criado para VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -10359,306 +10393,306 @@ msgstr ""
 "VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) no SR "
 "%(sr_ref)s criada com sucesso."
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 #, fuzzy
 msgid "SR not present and could not be introduced"
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, fuzzy, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 "Solicitando à xapi para realizar upload da imagem %(vdi_uuids)s com ID "
 "%(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Tamanho da imagem %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copiando o VDI %s de /boot/guest no dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk %s destruidos"
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Verificando o vdi %s para kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr "O VDI %s continua disponível"
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-escaneando SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "O VHD %(vdi_uuid)s tem pai %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Conectando VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "O VDB %s foi conectado."
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destruindo VBD para o VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "O VBD para o VDI %s foi destruído."
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Rodando pygrub novamente %s"
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen encontrado: %s"
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Kernel Xen não encontrado. Iniciando como HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10666,55 +10700,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, fuzzy, python-format
 msgid "Updating progress to %(progress)d"
 msgstr "Atualizando agente para %s"
@@ -10728,195 +10769,205 @@ msgstr "Iniciando a Bridge para %s"
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 #, fuzzy
 msgid "Starting instance"
 msgstr "Iniciando instância %s"
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Falha ao suspender instância"
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+#, fuzzy
+msgid "Unable to terminate instance."
+msgstr "Falhou ao reiniciar instância"
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Criando a VIF para VM %(vm_ref)s, rede %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Criando a VIF para VM %(vm_ref)s, rede %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -11045,16 +11096,25 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 msgid "status must be 'in-use'"
 msgstr ""
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr "A instância %(instance_id)s não está executando."
+
diff --git a/nova/locale/ru/LC_MESSAGES/nova.po b/nova/locale/ru/LC_MESSAGES/nova.po
index bb486eb85..ebea35ab6 100644
--- a/nova/locale/ru/LC_MESSAGES/nova.po
+++ b/nova/locale/ru/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+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"
@@ -88,7 +88,7 @@ msgstr "Ра�положение флагов: %s"
 msgid "An unknown exception occurred."
 msgstr "Обнаружено неизве�тное и�ключение."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -175,8 +175,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr "�еправильный ключ метаданных"
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "�едопу�тимый диапазон портов %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "�едопу�тимый протокол IP %(protocol)s."
@@ -1266,57 +1266,69 @@ msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
 #: nova/exception.py:1157
+#, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "Квота проекта %(project_id)s не найдена."
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Проект %(project_id)s не найден."
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "set_admin_password не реализован в �той драйвере."
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "Копи� %(instance_id)s не переведена в режим во��тановлени�"
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "Копи� %(instance_id)s не переведена в режим во��тановлени�"
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1327,7 +1339,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1348,206 +1360,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-#, fuzzy
-msgid "Full set of CONF:"
-msgstr "Полный набор ФЛ�ГОВ:"
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, fuzzy, python-format
-msgid "Caught %s, exiting"
-msgstr "�нимок %s: удаление"
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, fuzzy, python-format
-msgid "Starting %d workers"
-msgstr "у�тановка �етевого узла"
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, fuzzy, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr "Запу�к узла �ети (вер�и� %(vcs_string)s) %(topic)s"
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "Служба завершила работу из-за от�ут�тви� запи�и базы данных"
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr "Выполнение команды (SSH): %s"
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr "Среда не поддерживает�� � и�пользованием SSH"
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr "process_input не поддерживает�� � и�пользованием SSH"
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr "Результат %s"
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr "отладка в обратном вызове: %s"
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "�едопу�тимый внутренний интерфей�: %s"
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Ожидал�� объект типа: %s"
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "�едопу�тима� server_string: %s"
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc: '%(name)s' зан�ла %(total_time).2f �."
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, fuzzy, python-format
 msgid "Reloading cached file %s"
 msgstr "Выгрузка образа %s"
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "Ошибка удалени� контейнера: %s"
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1632,135 +1563,130 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr "Слишком много неудачных попыток аутентификации."
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "Ошибка аутентификации: %s"
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "Слишком много неудачных попыток аутентификации."
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr "дей�твие: %s"
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 "�еавторизированный запро� дл� контроллера=%(controller)s и "
 "дей�тви�=%(action)s"
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 "Произошла неизве�тна� ошибка. Пожалуй�та, попытайте�ь повторить ваш "
 "запро�."
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
@@ -1772,70 +1698,75 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr "Создать �нимок тома %s"
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "Ошибка дешифрировани� личного ключа: %s"
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr "Создание пары ключей %s"
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr "Импортировать ключ %s"
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Удаление пары ключей %s"
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "�едо�таточно параметров дл� �бора правильного правила."
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, fuzzy, python-format
+msgid "Invalid IP protocol %s."
+msgstr "�едопу�тимый протокол IP %(protocol)s."
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr "От�ут�твует правило дл� заданных параметров."
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Это правило уже �уще�твует в группе %s"
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Получить кон�ольный вывод дл� копии %s"
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "Создать том из �нимка %s"
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Создание раздела %s ГБ"
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 #, fuzzy
 msgid "Delete Failed"
 msgstr "Ошибка �оздани�"
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "Подключить том %(volume_id)s дл� копии %(instance_id)s на %(device)s"
@@ -1845,7 +1776,7 @@ msgstr "Подключить том %(volume_id)s дл� копии %(instance_i
 msgid "Attach Failed."
 msgstr "Ошибка �оздани�"
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "От�оединить том %s"
@@ -1856,7 +1787,7 @@ msgid "Detach Volume Failed."
 msgstr "От�оединить том %s"
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "аттрибут не поддерживает��: %s"
@@ -1889,142 +1820,142 @@ msgstr "�евозможно найти адре� %r"
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "При�воить адре� %(public_ip)s копии %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "�евозможно найти адре� %r"
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "�евозможно найти адре� %r"
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr "И�ключить адре� %s"
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr "Образ должен быть до�тупен"
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr "Выполнение завершени� работы копий"
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Перезагрузить копию %r"
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr "Выполнение о�тановки копий"
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr "Выполнение запу�ка копий"
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr "И�ключение реги�трации образа %s"
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Зареги�трированный образ %(image_location)s � идентификатором %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr "не указан пользователь или группа"
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr "поддерживает�� только группа \"в�е(all)\""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Обновление о�ведомлённо�ти об образе %s"
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "�евозможно о�тановить копию в течении %d �."
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 #, fuzzy
 msgid "Expecting a list of resources"
 msgstr "Перечень копий"
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "копи� - %s не пред�тавлена"
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 #, fuzzy
 msgid "Expecting a list of tagSets"
 msgstr "Перечень копий"
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "�едопу�тимый cidr %(cidr)s."
@@ -2066,12 +1997,12 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 #, fuzzy
 msgid "Invalid proxy request signature."
 msgstr "�едопу�тимый запро�: %s"
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, fuzzy, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr "Ошибка получени� метаданных дл� ip: %s"
@@ -2090,12 +2021,12 @@ msgstr "%(url)s возвратил � HTTP %(status)d"
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr "Ра�ширенный ре�ур�: %s"
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
@@ -2104,7 +2035,7 @@ msgstr ""
 "Ра�ширение %(ext_name)s: �евозможно ра�ширить ре�ур� %(collection)s: �ет "
 "такого ре�ур�а"
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr "Ра�ширение %(ext_name)s ра�ширение ре�ур�а: %(collection)s"
@@ -2116,64 +2047,64 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr "маркер [%s] не найден"
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr "href %s не �одержит вер�ию"
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 #, fuzzy
 msgid "Invalid image metadata"
 msgstr "�едопу�тимые метаданные"
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr "�евозможно '%(action)s', когда копи� в %(attr)s %(state)s"
 
-#: nova/api/openstack/common.py:364
-#, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+#: nova/api/openstack/common.py:366
+#, fuzzy, python-format
+msgid "Instance is in an invalid state for '%s'"
 msgstr "Копи� в недопу�тимом �о�то�нии дл� '%(action)s'"
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr "Отклонение запро�а �нимка, �нимки в данный момент отключены"
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr "Снимки копии в на�то�щий момент недопу�тимы."
 
@@ -2227,14 +2158,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "Ошибка загрузки ра�ширени� %(ext_factory)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
 #: nova/api/openstack/extensions.py:370
-#, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+#, fuzzy, python-format
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr "Ошибка загрузки ра�ширени� %(ext_name)s: %(exc)s"
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2277,13 +2208,13 @@ msgstr "Пу�тое тело предо�тавлено в запро�е"
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr "�еправильное тело запро�а"
 
@@ -2292,20 +2223,20 @@ msgstr "�еправильное тело запро�а"
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, fuzzy, python-format
 msgid "Calling method %s"
 msgstr "Выполн�ет�� вызов getter %s"
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr "�е поддерживаемый  тип �одержимого"
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr "�еправильный запро� url"
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2318,12 +2249,12 @@ msgstr "�лемент не �вл�ет�� потомком"
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2331,17 +2262,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr "Инициализаци� ди�петчера ра�ширений."
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, fuzzy, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr "�е допу�тима� подпи�ь дл� пользовател� %s"
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, fuzzy, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr "�е допу�тима� подпи�ь дл� пользовател� %s"
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2408,217 +2339,217 @@ msgstr "Сервер не �уще�твует"
 msgid "Metadata item was not found"
 msgstr "Элемент метаданных не найден"
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 #, fuzzy
 msgid "Only administrators may list deleted instances"
 msgstr "Выполнение запу�ка копий"
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, fuzzy, python-format
 msgid "Flavor '%s' could not be found "
 msgstr "Узел %(host)s не найден."
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr "Копи� не найдена"
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 #, fuzzy
 msgid "Unknown argment : port"
 msgstr "�еизве�тна� цепочка: %r"
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, fuzzy, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr "�едопу�тимый �етевой формат: �етевой uuid имеет неправильный формат (%s)"
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr "�едопу�тимый �етевой формат: �етевой uuid имеет неправильный формат (%s)"
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr "�едопу�тимый фик�ированный IP-адре� (%s)"
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr "Дубликаты �етей (%s) не разрешены"
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr "�едопу�тимый �етевой формат: от�ут�твует %s"
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr "�едопу�тимый �етевой формат"
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr "Содержимое данных пользовател� не может быть дешифровано"
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr "Им� �ервера не задано"
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr "Предо�тавлен недопу�тимый flavorRef."
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr "�евозможно найти запрошенный образ"
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr "Предо�тавлен недопу�тимый key_name."
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "Точка подключени� не может быть переведена: %s"
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "Точка подключени� не может быть переведена: %s"
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr "С копией не производило�ь изменение размера."
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "Копи� %(instance_id)s не найдена."
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr "От�ут�твует аргумент типа 'type' дл� перезагрузки"
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 #, fuzzy
 msgid "Resize requires a flavor change."
 msgstr "Изменение размера требует изменени� объёма."
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr "От�ут�твует атрибут imageRef"
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr "От�ут�твует атрибут flavorRef"
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr "adminPass не был задан"
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr "�едопу�тимый adminPass"
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "Запро� изменени� размера имеет недопу�тимый атрибут 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "Запро�ы изменение размера требуют атрибут 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr "�едопу�тимый запро� тела"
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2626,9 +2557,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
-#, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+#: nova/api/openstack/compute/servers.py:1408
+#, fuzzy, python-format
+msgid "Removing options '%s' from query"
 msgstr "Удаление параметров '%(unk_opt_str)s' из запро�а"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2715,7 +2646,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2734,19 +2665,19 @@ msgid "Compute.api::resetState %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
-#, python-format
-msgid "Cannot show aggregate: %(id)s"
-msgstr ""
+#, fuzzy, python-format
+msgid "Cannot show aggregate: %s"
+msgstr "Ошибка обновлени� агента: %(resp)r"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, fuzzy, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr "Ошибка обновлени� агента: %(resp)r"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
-#, python-format
-msgid "Cannot delete aggregate: %(id)s"
-msgstr ""
+#, fuzzy, python-format
+msgid "Cannot delete aggregate: %s"
+msgstr "Ошибка обновлени� агента: %(resp)r"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
 #, python-format
@@ -2907,15 +2838,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, fuzzy, python-format
 msgid "Error in evacuate, %s"
 msgstr "Ошибка перемещени� %s"
@@ -3029,7 +2960,7 @@ msgstr ""
 "%(instance_id)s"
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3063,29 +2994,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr "Перевод узла %(host)s в %(state)s."
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Выполн�ет�� вызов getter %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Обновление �о�то�ни� узла"
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3316,33 +3247,33 @@ msgstr "vol=%s"
 msgid "Delete volume with id: %s"
 msgstr "Удалить том � идентификатором: %s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, fuzzy, python-format
 msgid "Instance %s is not attached."
 msgstr "Копи� %s не найдена."
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, fuzzy, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr "�едопу�тимый �етевой формат: �етевой uuid имеет неправильный формат (%s)"
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr "При�оединить том %(volume_id)s к копии %(server_id)s на %(device)s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr "Удалить �нимок � идентификатором: %s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr "Создать �нимок из тома %s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3361,94 +3292,94 @@ msgstr "При�воить адре� %s"
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "не определен метод дл� �ообщени�: %s"
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, fuzzy, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr "Ошибка загрузки ра�ширени� %(ext_factory)s: %(exc)s"
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "не определен метод дл� �ообщени�: %s"
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, fuzzy, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr "Выгрузка образа %s"
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, fuzzy, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
-msgstr "Перемещение не найдено дл� копии %(instance_id)s в �о�то�нии %(status)s."
+msgid "Got update for instance: %(instance)s"
+msgstr "�е найден том дл� копии %(instance_id)s."
 
-#: nova/cells/messaging.py:838
+#: nova/cells/messaging.py:862
 #, fuzzy, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+msgid "Got update to delete instance"
 msgstr "�е найден том дл� копии %(instance_id)s."
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3465,7 +3396,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "�е найден том дл� копии %(instance_id)s."
@@ -3479,7 +3410,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3506,7 +3437,7 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr "Запу�к VPN дл� %s"
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, fuzzy, python-format
 msgid "Failed to load %s"
 msgstr "�евозможно �оздать том"
@@ -3526,281 +3457,281 @@ msgstr "�лемент не �вл�ет�� потомком"
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 #, fuzzy
 msgid "leasing ip"
 msgstr "Создание изображени�"
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 #, fuzzy
 msgid "releasing ip"
 msgstr "Создание изображени�"
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 #, fuzzy
 msgid "Reserved"
 msgstr "получено %s"
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Ошибка БД: %s"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 #, fuzzy
 msgid "network"
 msgstr "Во��тановление �ети"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 #, fuzzy
 msgid "IP address"
 msgstr "Выделить адре�"
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "Тип тома %(name)s уже �уще�твует."
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr "IPv4"
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr "IPv6"
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr "проект"
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 #, fuzzy
 msgid "No networks found"
 msgstr "Сеть не найдена"
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "%(req)s необходимо дл� �оздани� �ети."
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 #, fuzzy
 msgid "instance"
 msgstr "Выполнение о�тановки копий"
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "Служба %(service_id)s не найдена."
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "Служба %(service_id)s не найдена."
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "�епредвиденна� ошибка: %s"
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 #, fuzzy
 msgid "PROJECT"
 msgstr "проект"
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3882,26 +3813,26 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr ""
 "Превышена квота копий. Вы не можете запу�тить дополнительные копии �того "
 "типа."
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "Превышена квота копий. Вы можете запу�тить только %s копий �того типа."
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, fuzzy, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr "Превышена квота дл� %(pid)s, попытка выполнить %(min_count)s копий"
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
@@ -3910,97 +3841,97 @@ msgstr ""
 "Превышена квота дл� %(pid)s, попытка назначить %(num_metadata)s �вой�тв "
 "метаданных"
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "�евозможно при�оединить том дл� копии %s"
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Выполн�ет запу�к %s копий..."
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Выполнение завершени� работы копий"
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "Тип копии %(instance_type_id)s не найден."
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Выполнение завершени� работы копий"
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, fuzzy, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr "От�ут�твует узел дл� копии %s, немедленное удаление"
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Выполнение запу�ка копий"
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Будет выполнени� попытка завершить работу %s"
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Попытка о�тановить %s"
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Попытка запу�тить %s"
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr "Пои�к по: %s"
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Запу�к �нимка дл� ВМ %s"
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4009,62 +3940,62 @@ msgstr ""
 "У�таревший тип копии %(current_instance_type_name)s,  новый тип копии "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, fuzzy, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr "Превышена квота дл� %(pid)s, попытка выполнить %(min_count)s копий"
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Будет выполнени� попытка завершить работу %s"
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Группа безопа�но�ти %s не может быть пу�той."
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, fuzzy, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -4073,69 +4004,69 @@ msgstr ""
 "Значение (%s) дл� параметра GroupName недопу�тимо. Длина превышает "
 "мак�имально допу�тимое значение 255."
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Создать группу безопа�но�ти %s"
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Группа безопа�но�ти %s уже �уще�твует"
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "�евозможно ликвидировать vbd %s"
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Группа безопа�но�ти (%s) не найдена"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr "Удалить группу безопа�но�ти %s"
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Правило (%s) не найдено"
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "Добавление правила группы безопа�но�ти: %r"
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4170,218 +4101,218 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr "Копи� типа %s не найдена дл� выполнени� удалени�"
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr "�евозможно переме�тить копию (%(instance_id)s) на текущий узел (%(host)s)."
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 #, fuzzy
 msgid "Hypervisor driver does not support resume guests"
 msgstr "Драйвер гипервизора не поддерживает правила брандмау�ра"
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Ошибка прио�тановлени� копии"
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Драйвер гипервизора не поддерживает правила брандмау�ра"
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "�епредвиденный код �о�то�ни�"
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Выполнение запу�ка копий"
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
@@ -4390,7 +4321,7 @@ msgstr ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
@@ -4399,101 +4330,101 @@ msgstr ""
 "Образ '%(image_id)s' размером %(size_bytes)d, превышает exceeded "
 "instance_type допу�тимый размер %(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Выполнение запу�ка копий"
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Пропу�к DiskNotFound: %s"
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, fuzzy, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "Пропу�к DiskNotFound: %s"
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr "завершение работы bdm %s"
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s. У�тановка �о�то�ни� копии vm_state на ERROR"
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Обновление �борки %s"
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, fuzzy, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr "%(path)s ра�полагает�� на общедо�тупном накопителе: %(reason)s"
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Создать �нимок из тома %s"
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Перезагрузка копии %s"
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, fuzzy, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -4502,22 +4433,22 @@ msgstr ""
 "попытка перезагрузки не выполн�емой копии: %(instance_uuid)s (�о�то�ние: "
 "%(state)s ожидало�ь: %(running)s)"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "Обновление �борки %s"
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "копи� не включена"
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "копи� %s: выполнение �нимка"
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, fuzzy, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -4526,224 +4457,224 @@ msgstr ""
 "попытка �оздани� �нимка не выполн�емой копии: %(instance_uuid)s "
 "(�о�то�ние: %(state)s ожидало�ь: %(running)s)"
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "�айдено %(num_images)d образов (ротаци�: %(rotation)d)"
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr "Удаление образа %s"
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "�евозможно назначить пароль админи�тратора. Копи� %s не выполн�ет��"
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 #, fuzzy
 msgid "Root password set"
 msgstr "Копи� %s: �азначение админи�тративного парол�"
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 #, fuzzy
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr "set_admin_password не реализован в �той драйвере."
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, fuzzy, python-format
 msgid "set_admin_password failed: %s"
 msgstr "set_admin_password не реализован в �той драйвере."
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 #, fuzzy
 msgid "error setting admin password"
 msgstr "Ошибка назначени� парол� админи�тратора"
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Ошибка прио�тановлени� копии"
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Копи� не �уще�твует"
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr "назначение �овпадает � и�точником!"
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "копи� %s: прин�тие диагно�тики"
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 #, fuzzy
 msgid "Reset network"
 msgstr "Во��тановление �ети"
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 #, fuzzy
 msgid "Inject network info"
 msgstr "у�тановка �етевого узла"
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 #, fuzzy
 msgid "Get console output"
 msgstr "Получить кон�ольный вывод дл� копии %s"
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "копи� %s: получение кон�оли vnc"
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 #, fuzzy
 msgid "Getting spice console"
 msgstr "копи� %s: получение кон�оли vnc"
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "От�оединение тома от неизве�тной копии %s"
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Попытка удалени� не�уще�твующей кон�оли %(console_id)s."
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, fuzzy, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr "�етевые ра�пределени� дл� копии %s"
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, fuzzy, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr "Сеть %(network_id)s не найдена."
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, fuzzy, python-format
 msgid "Host %(host)s not found"
 msgstr "Узел %(host)s не найден."
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 #, fuzzy
 msgid "_post_live_migration() is started.."
 msgstr "Запущено post_live_migration().."
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -4752,21 +4683,21 @@ msgstr ""
 "от�ут�твует домен � �оответ�твующим именем.\" Эта ошибка может быть "
 "безопа�но пропущена."
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 #, fuzzy
 msgid "Post operation of migration started"
 msgstr "Запущено post_live_migration().."
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Ошибка получени� метаданных дл� ip: %s"
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -4775,64 +4706,64 @@ msgstr ""
 "�айдены %(migration_count)d неподтверждённых перемещений, �тарше "
 "%(confirm_window)d �екунд"
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, fuzzy, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr "Завершение работы ВМ дл� копии %(instance_uuid)s"
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "Копи� %(instance_id)s не найдена"
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 #, fuzzy
 msgid "In ERROR state"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr "Обновление временных данных и�пользовани� поло�ы пропу�кани�"
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Обновление временных данных и�пользовани� поло�ы пропу�кани�"
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr "Обновление �о�то�ни� узла"
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -4841,87 +4772,92 @@ msgstr ""
 "�айдено %(num_db_instances)s в базе данных и %(num_vm_instances)s в "
 "гипервизоре."
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "копи� не включена"
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 #, fuzzy
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, пропу�к..."
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, fuzzy, python-format
 msgid "No service record for host %s"
 msgstr "�ет �лужбы дл� compute ID %s"
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, fuzzy, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 "�е ра�познанное значение '%(action)s' дл� "
 "FLAGS.running_deleted_instance_action"
 
+#: nova/compute/manager.py:4129
+#, fuzzy, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr "%s. У�тановка �о�то�ни� копии vm_state на ERROR"
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -5033,7 +4969,7 @@ msgstr "�евозможно найти узел дл� копии %s"
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5044,7 +4980,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 #, fuzzy
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr "block_device_mapping %s"
@@ -5125,56 +5061,52 @@ msgstr "Проверка токена: %(token)s, %(token_valid)s)"
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 #, fuzzy
 msgid "Failed to notify cells of instance update"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 #, fuzzy
 msgid "Failed to notify cells of instance fault"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "�ера�познанное значение read_deleted '%s'"
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "�едопу�тимый запро� тела"
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5191,51 +5123,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5320,16 +5252,20 @@ msgstr "�едопу�тимый префик� дл� to_global_ipv6: %s"
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr "�едопу�тимый project_id дл� to_global_ipv6: %s"
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 #, fuzzy
 msgid "Failed storing info cache"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, fuzzy, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr "При�воить адре� %(public_ip)s копии %(instance_id)s"
@@ -5443,17 +5379,17 @@ msgstr "Этот драйвер поддерживает только запи�
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr "Предприн�та удалить цепочку %s, котора� не �уще�твует"
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr "�еизве�тна� цепочка: %r"
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
@@ -5462,86 +5398,86 @@ msgstr ""
 "Предприн�та попытка удалить правило, которого там нет: %(chain)r %(rule)r"
 " %(wrap)r %(top)r"
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "�едопу�тимое �о�то�ние: '%s'"
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Запу�к интерфей�а VLAN %s"
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Запу�к копии %s"
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "Интерфей� %(interface)s не найден"
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Ошибка прио�тановлени� копии"
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Запу�к копии %s"
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Ошибка запу�ка xvp: %s"
@@ -5642,18 +5578,18 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr "cidr уже и�пользует��"
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 "запрошенна� cidr (%(cidr)s) конфликтует � �уще�твующей �упер-�етью "
 "(%(super)s)"
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
@@ -5662,22 +5598,22 @@ msgstr ""
 "запрошенна� cidr (%(cidr)s) конфликтует � �уще�твующей, меньшей cidr "
 "(%(smaller)s)"
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr "Сеть уже �уще�твует!"
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "Сеть должна быть и�ключена из проекта %s перед удалением"
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, fuzzy, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5715,7 +5651,7 @@ msgstr "_удалить: %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5798,70 +5734,70 @@ msgstr "у�тановка �етевого узла"
 msgid "Quantum Error creating security group %s"
 msgstr "Удалить группу безопа�но�ти %s"
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Удалить группу безопа�но�ти %s"
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Обнаружена ошибка: %s"
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Удалить группу безопа�но�ти %s"
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Группа безопа�но�ти (%s) не найдена"
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Удалить группу безопа�но�ти %s"
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Обнаружена ошибка: %s"
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Группа безопа�но�ти � правилом %(rule_id)s не найдена."
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, fuzzy, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 "Группа безопа�но�ти %(security_group_id)s не найдена дл� проекта "
 "%(project_id)s."
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5880,27 +5816,27 @@ msgstr "Это правило уже �уще�твует в группе %s"
 msgid "Original exception being dropped: %s"
 msgstr "ограничени� внешнего ключа не могут быть удалены"
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5910,17 +5846,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr "�епредвиденна� ошибка: %s"
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, fuzzy, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr "Кла�� %(fullname)s у�тарел: %(msg)s"
@@ -5993,11 +5929,92 @@ msgstr "ПринÑ�Ñ‚Ñ‹ неизвеÑ�тные аргументы ключевоÐ
 msgid "Running cmd (subprocess): %s"
 msgstr "Выполнение команды (�убпроце��): %s"
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr "Результат %s"
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r ошибка. Выполн�ет�� повтор."
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr "Выполнение команды (SSH): %s"
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr "Среда не поддерживает�� � и�пользованием SSH"
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr "process_input не поддерживает�� � и�пользованием SSH"
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+#, fuzzy
+msgid "Full set of CONF:"
+msgstr "Полный набор ФЛ�ГОВ:"
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, fuzzy, python-format
+msgid "Caught %s, exiting"
+msgstr "�нимок %s: удаление"
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, fuzzy, python-format
+msgid "Starting %d workers"
+msgstr "у�тановка �етевого узла"
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr ""
@@ -6138,12 +6155,12 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 #, fuzzy
 msgid "An unknown RPC related exception occurred."
 msgstr "Обнаружено неизве�тное и�ключение."
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
@@ -6152,46 +6169,51 @@ msgstr ""
 "Удалённа� ошибка: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Возврат и�ключени� %s вызывающему"
@@ -6517,7 +6539,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6525,37 +6547,49 @@ msgid ""
 msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+#, fuzzy, python-format
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr "Попытка �обрать %(num_instances)d копию(й)"
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, fuzzy, python-format
+msgid "Request Spec: %s"
+msgstr "Запро�: %s"
+
+#: nova/scheduler/filter_scheduler.py:97
+#, fuzzy, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr "�е найден том дл� копии %(instance_id)s."
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "Отфильтрованы %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:357
-#, python-format
-msgid "Choosing host %(chosen_host)s"
-msgstr ""
+#: nova/scheduler/filter_scheduler.py:361
+#, fuzzy, python-format
+msgid "Weighed %(hosts)s"
+msgstr "Отфильтрованы %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr "�евозможно переме�тить копию (%(instance_id)s) на текущий узел (%(host)s)."
@@ -6750,47 +6784,47 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 #, fuzzy
 msgid "memcached_servers not defined"
 msgstr "Им� �ервера не задано"
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6843,58 +6877,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr ""
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr "Имитаци� выполнени� команды (�убпроце��): %s"
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr "Имитаци� команды привела к и�ключению %s"
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr "Ответ на имитацию команды в stdout='%(stdout)s' stderr='%(stderr)s'"
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 #, fuzzy
 msgid "fake vswitch not found"
@@ -6929,18 +6947,18 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 #, fuzzy
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr "Превышена квота дл� %(pid)s, попытка выполнить %(min_count)s копий"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6949,7 +6967,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr "Выполн�емые копии: %s"
@@ -6966,16 +6984,16 @@ msgstr "По�ле завершени� работы копий: %s"
 msgid "Internal error"
 msgstr "Внутренн�� ошибка"
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "По�ле принудительного завершени� работы копий: %s"
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 #, fuzzy
 msgid "spawn error"
 msgstr "Ошибка аутентификации"
@@ -7075,6 +7093,22 @@ msgstr "�епредвиденный код �о�то�ни�"
 msgid "Decoding JSON: %s"
 msgstr "Декодирование JSON: %s"
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -7099,11 +7133,11 @@ msgid "Loading compute driver '%s'"
 msgstr "LoggingVolumeDriver: %s"
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+#, fuzzy
+msgid "Unable to load the virtualization driver"
 msgstr "�евозможно загрузить драйвер виртуализации: %s"
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -7225,19 +7259,19 @@ msgstr ""
 msgid "ipmitool stdout: '%(out)s', stderr: '%(err)s'"
 msgstr "Ответ на имитацию команды в stdout='%(stdout)s' stderr='%(stderr)s'"
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7407,15 +7441,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7473,97 +7507,97 @@ msgstr "разделы не найдена"
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr "образ уже при�оединён"
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, fuzzy, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr "Ошибка монтировани� файловой �и�темы: %s"
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, fuzzy, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr "Ошибка монтировани� файловой �и�темы: %s"
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7901,7 +7935,7 @@ msgstr "Вер�и� агента копии: %s"
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7916,24 +7950,24 @@ msgstr "Получить кон�ольный вывод дл� копии %s"
 msgid "Host IP address is: %s"
 msgstr "При�воить адре� %s"
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8263,12 +8297,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Перечень копий"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "�евозможно найти конфигурацию по адре�у %(path)s"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "�евозможно найти конфигурацию по адре�у %(path)s"
@@ -8434,7 +8468,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr "Создание �нимка копии ВМ %s "
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8502,207 +8536,207 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr "Подключение к libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Выполнение о�тановки копий"
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, fuzzy, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr "Ошибка schedule_%(method)s: %(ex)s"
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Сети не определены."
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Сети не определены."
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "�нимок %s: �оздание завершено"
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Пользователь не имеет админи�тративных привилегий"
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr "Создание изображени�"
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Запро� xapi на приём образа vhd %(image)s"
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8710,12 +8744,12 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -8724,27 +8758,27 @@ msgstr ""
 "Ошибка libvirt во врем� пои�ка %(instance_name)s: [Код ошибки "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 #, fuzzy
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
@@ -8753,35 +8787,35 @@ msgstr ""
 "�евозможно получить количе�тво ЦПУ, так как �та возможно�ть не "
 "реализована дл� �той платформы. Эту ошибку можно безопа�но пропу�тить."
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "у�таревша� вер�и� libvirt (не поддерживает�� getVersion)"
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Получение размера образа дл� образа %s"
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8789,21 +8823,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -8812,29 +8846,29 @@ msgstr ""
 "Создание временного файла %s дл� оповещени� других узлов �ети compute о "
 "необходимо�ти при�оединени� того же хранилища."
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8844,7 +8878,7 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -8853,22 +8887,22 @@ msgstr ""
 "Создание временного файла %s дл� оповещени� других узлов �ети compute о "
 "необходимо�ти при�оединени� того же хранилища."
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "Ошибка аутентификации: %s"
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, fuzzy, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr "plug_vifs() ошибка %(cnt)d.До %(max_retry)d попыток дл� %(hostname)s."
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, fuzzy, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
@@ -8877,39 +8911,39 @@ msgstr ""
 "Ошибка libvirt во врем� пои�ка %(instance_name)s: [Код ошибки "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 #, fuzzy
 msgid "Instance running successfully."
 msgstr "Копи� %s: выполнение"
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8944,153 +8978,153 @@ msgstr "nwfilter(%(instance_filter_name)s) дл�%(name)s не найден."
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "Брандмау�р iptables: �а�тройка базовой фильтрации"
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, fuzzy, python-format
 msgid "Unknown image_type=%s"
 msgstr "неизве�тный обработчик образа ди�ка: %s"
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, fuzzy, python-format
 msgid "Reading image info file: %s"
 msgstr "Выгрузка образа %s"
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, fuzzy, python-format
 msgid "Writing stored info to %s"
 msgstr "Запу�к мо�та интерфей�а дл� %s"
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -9204,12 +9238,12 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr "iSCSI-у�трой�тво не найдено в %s"
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, fuzzy, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
@@ -9218,48 +9252,48 @@ msgstr ""
 "Том ISCSI не найден в: %(mount_device)s. Будет выполнена повторна� "
 "проверка и попытка.  Повторение: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, fuzzy, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr "�айден узел iSCSI %(mount_device)s (по�ле %(tries)s повторных проверок)"
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, fuzzy, python-format
 msgid "%s is already mounted"
 msgstr "образ уже при�оединён"
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, fuzzy, python-format
 msgid "AoE device not found at %s"
 msgstr "iSCSI-у�трой�тво не найдено в %s"
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, fuzzy, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 "Том ISCSI не найден в: %(mount_device)s. Будет выполнена повторна� "
 "проверка и попытка.  Повторение: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, fuzzy, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr "�айден узел iSCSI %(mount_device)s (по�ле %(tries)s повторных проверок)"
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 #, fuzzy
 msgid "Fibre Channel device not found."
 msgstr "iSCSI-у�трой�тво не найдено в %s"
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, fuzzy, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
@@ -9268,30 +9302,30 @@ msgstr ""
 "Том ISCSI не найден в: %(mount_device)s. Будет выполнена повторна� "
 "проверка и попытка.  Повторение: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, fuzzy, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr "�айден узел iSCSI %(mount_device)s (по�ле %(tries)s повторных проверок)"
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9365,35 +9399,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, fuzzy, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr "Выполнение команды (�убпроце��): %s"
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 #, fuzzy
 msgid "File transfer from PowerVM manager failed"
 msgstr "Сбой �оединени� c melange"
@@ -9486,74 +9520,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, fuzzy, python-format
 msgid "LPAR instance '%s' not found"
 msgstr "Копи� не найдена"
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, fuzzy, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr "Запу�к мо�та интерфей�а дл� %s"
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, fuzzy, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr "Перечень копий"
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, fuzzy, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr "копи� %s: Создание образа"
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, fuzzy, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr "Выполнение запу�ка копий"
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, python-format
 msgid "Instance '%s' failed to boot"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, fuzzy, python-format
 msgid "Instance spawned in %s seconds"
 msgstr "копи� не в прио�тановленном �о�то�нии"
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, fuzzy, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr "копи� %s: выполнение �нимка"
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, fuzzy, python-format
 msgid "Shutting down the instance '%s'"
 msgstr "Включение питани� на копии ВМ %s"
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, fuzzy, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr "Выполнение запу�ка копий"
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -10038,7 +10072,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -10198,14 +10232,14 @@ msgstr "Ошибка пои�ка тома в базе данных"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Точка подключени� %(mountpoint)s от�оединена от копии %(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, fuzzy, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 "ВРЕМЯ ПРОСТОЯ: Срок вызова %(method)s и�тёк. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, fuzzy, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -10214,7 +10248,7 @@ msgstr ""
 "�Е РЕ�ЛИЗОВ��О: Вызов %(method)s не поддерживает�� агентом. VM "
 "id=%(instance_uuid)s; args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, fuzzy, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr "Вызов %(method)s возвратил ошибку: %(e)s."
@@ -10324,26 +10358,26 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Ошибка дешифрировани� личного ключа: %s"
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr "Запу�к узла на XenServer не поддерживает��."
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 "�евозможно выполнить вход в XenAPI (недо�таточно �вободного ме�та на "
 "Dom0?)"
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr "И�ключение: %s"
@@ -10483,73 +10517,73 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 #, fuzzy
 msgid "Created VM"
 msgstr "_�оздать: %s"
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD не найдено дл� копии %s"
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "группа %s уже �уще�твует"
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "�евозможно от�оединить VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "�евозможно ликвидировать VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Создана VBD %(vbd_ref)s дл� ВМ %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Создана VBD %(vbd_ref)s дл� ВМ %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr "�евозможно ликвидировать VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -10558,88 +10592,88 @@ msgstr ""
 "Создан VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) "
 "на %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 #, fuzzy
 msgid "SR not present and could not be introduced"
 msgstr "Копи� не найдена"
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, fuzzy, python-format
 msgid "block device info: %s"
 msgstr "block_device_list %s"
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, fuzzy, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr "От�ут�твует первичный VDI дл�%(vm_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "Запу�к �нимка дл� ВМ %s"
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, fuzzy, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 "xapi 'download_vhd' возвратил VDI типа '%(vdi_type)s' � UUID "
 "'%(vdi_uuid)s'"
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, fuzzy, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr "Запро� xapi на приём образа vhd %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
@@ -10648,17 +10682,17 @@ msgstr ""
 "Размер образа %(size_bytes)d превышает допу�тимый instance_type  размер "
 "%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "Получение образа %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Ядро не найдено дл� образа %(image_id)s."
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
@@ -10667,204 +10701,204 @@ msgstr ""
 "Превышен размер �дра/Ramdisk образа: %(vdi_size)d байт, мак�. "
 "%(max_size)d байт"
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Копирование VDI %s в /boot/guest на dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Ядро/Ramdisk VDI %s ликвидирован"
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr "Обнаружен %(image_type_str)s формат дл� образа %(image_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Пои�к vdi %s дл� �дра PV"
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr "�еизве�тный формат образа %(disk_image_type)s"
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s до �их пор до�тупен"
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Повторна� проверка SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr "�евозможно найти SR типа �одержимого ISO"
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr "ISO: пои�к SR %(sr_rec)s"
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr "ISO: не �одержимое iso типа"
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr "ISO: SR � локальной PBD"
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "Врем� ожидани� при �оздании у�трой�тва %s"
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Под�оединение VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Под�оединение VBD %s выполнено."
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr "VBD %(vbd_ref)s под�оединено как %(orig_dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 "VBD %(vbd_ref)s под�оединено в неправильный dev, изменение назначени� на "
 "%(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Ликвидирование VBD дл� VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Ликвидирование VBD дл� VDI %s завершено."
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "�айдено �дро Xen %s"
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Ядро Xen не найдено.  Загрузка HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10872,16 +10906,16 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr "Разделы:"
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d �екторов"
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
@@ -10890,41 +10924,48 @@ msgstr ""
 "Запи�ь таблицы разделов %(primary_first)d %(primary_last)d в "
 "%(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Запи�ь таблицы разделов %s выполнена."
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 "Ошибка при�оединени� файловой �и�темы (ожидаемо дл� копий не на базе "
 "linux): %s"
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, fuzzy, python-format
 msgid "Updating progress to %(progress)d"
 msgstr "Обновление выполнени� копии '%(instance_uuid)s' до %(progress)d"
@@ -10938,212 +10979,222 @@ msgstr "Запу�к мо�та интерфей�а дл� %s"
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 #, fuzzy
 msgid "Starting instance"
 msgstr "Запу�к копии %s"
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr "Удаление �дра/ramdisk файлов из dom0"
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, fuzzy, python-format
 msgid "Block device information present: %s"
 msgstr "block_device_mapping %s"
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Ошибка обновлени� тома в базе данных"
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 #, fuzzy
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 "�втоматиче�ка� на�тройка ди�ка дл� копии %(instance_uuid)s, выполн�ет�� "
 "попытка изменени� размера раздела..."
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 #, fuzzy
 msgid "Starting VM"
 msgstr "Выполнение перезагрузки xvp"
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr "Вер�и� агента копии: %s"
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, fuzzy, python-format
 msgid "Could not find VM with name %s"
 msgstr "�евозможно найти конфигурацию по адре�у %(path)s"
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "Готовый �нимок и выгрузка дл� ВМ %s"
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr "Ошибка перемещени� vhd на новый узел"
 
-#: nova/virt/xenapi/vmops.py:813
-#, fuzzy, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
-msgstr "Изменение размера VDI %(cow_uuid)s � %(old_gb)dГБ до %(new_gb)dГБ"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+#, fuzzy
+msgid "Unable to terminate instance."
+msgstr "Ошибка перезагрузки копии"
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "Изменение размера VDI %(vdi_uuid)s � %(old_gb)dГБ до %(new_gb)dГБ"
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 #, fuzzy
 msgid "Resize complete"
 msgstr "Изменение размера копии %s завершено"
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 #, fuzzy
 msgid "Unable to find root VBD/VDI for VM"
 msgstr "Ошибка пои�ка vbd дл� vdi %s"
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 #, fuzzy
 msgid "Destroying VDIs"
 msgstr "Выполнение перезагрузки xvp"
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 #, fuzzy
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 "Копи� %(instance_uuid)s и�пользует RAW или VHD, пропу�к �дра и удаление "
 "ramdisk"
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr "копи� �одержит �дро или ramdisk, но не оба"
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr "файлы �дра/ramdisk удалены"
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 #, fuzzy
 msgid "Destroying VM"
 msgstr "Выполнение перезагрузки xvp"
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr "ВМ не предо�тавлена, пропу�к выполнени� ликвидации..."
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr "Копи� в �о�то�нии режима во��тановлени�: %s"
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 #, fuzzy
 msgid "VM is not present, skipping soft delete..."
 msgstr "ВМ не предо�тавлена, пропу�к выполнени� ликвидации..."
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 #, fuzzy
 msgid "Automatically hard rebooting"
 msgstr "�втоматиче�ка� безотказна� перезагрузка %d"
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "у�тановка �етевого узла"
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 #, fuzzy
 msgid "Creating vifs"
 msgstr "Создание изображени�"
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Создание VIF дл� ВМ %(vm_ref)s, �еть %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Создание VIF дл� ВМ %(vm_ref)s, �еть %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 #, fuzzy
 msgid "No suitable network for migrate"
 msgstr "�едопу�тимый �етевой формат"
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 #, fuzzy
 msgid "Migrate Send failed"
 msgstr "Ошибка �оздани�"
@@ -11274,18 +11325,29 @@ msgstr "�епредвиденна� ошибка: %s"
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr "Запу�к узла �ети nova-xvpvncproxy (вер�и� %s)"
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 #, fuzzy
 msgid "status must be 'in-use'"
 msgstr "Образ должен быть до�тупен"
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 #, fuzzy
 msgid "status must be 'available'"
 msgstr "Образ должен быть до�тупен"
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr ""
+#~ "Перемещение не найдено дл� копии "
+#~ "%(instance_id)s в �о�то�нии %(status)s."
+
diff --git a/nova/locale/tl/LC_MESSAGES/nova.po b/nova/locale/tl/LC_MESSAGES/nova.po
index 2d1a80fc1..f20cab01b 100644
--- a/nova/locale/tl/LC_MESSAGES/nova.po
+++ b/nova/locale/tl/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+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"
@@ -83,7 +83,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -167,8 +167,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -198,7 +198,7 @@ msgstr ""
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
@@ -1234,55 +1234,67 @@ msgstr ""
 
 #: nova/exception.py:1157
 #, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1293,7 +1305,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1313,205 +1325,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-msgid "Full set of CONF:"
-msgstr ""
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, python-format
-msgid "Starting %d workers"
-msgstr ""
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1596,130 +1528,125 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
@@ -1729,69 +1656,74 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, python-format
+msgid "Invalid IP protocol %s."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
@@ -1800,7 +1732,7 @@ msgstr ""
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
@@ -1810,7 +1742,7 @@ msgid "Detach Volume Failed."
 msgstr ""
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
@@ -1842,137 +1774,137 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2012,11 +1944,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr ""
@@ -2035,19 +1967,19 @@ msgstr ""
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -2059,63 +1991,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:364
+#: nova/api/openstack/common.py:366
 #, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -2169,14 +2101,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
 #: nova/api/openstack/extensions.py:370
 #, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2219,13 +2151,13 @@ msgstr ""
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr ""
 
@@ -2234,20 +2166,20 @@ msgstr ""
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, python-format
 msgid "Calling method %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2260,12 +2192,12 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2273,17 +2205,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2348,210 +2280,210 @@ msgstr ""
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, python-format
 msgid "Flavor '%s' could not be found "
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2559,9 +2491,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
+#: nova/api/openstack/compute/servers.py:1408
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+msgid "Removing options '%s' from query"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2648,7 +2580,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2668,17 +2600,17 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2830,15 +2762,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
@@ -2946,7 +2878,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -2979,29 +2911,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3220,33 +3152,33 @@ msgstr ""
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, python-format
 msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3265,94 +3197,93 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:838
-#, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+#: nova/cells/messaging.py:862
+msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3369,7 +3300,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3383,7 +3314,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3409,7 +3340,7 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, python-format
 msgid "Failed to load %s"
 msgstr ""
@@ -3429,271 +3360,271 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 #, fuzzy
 msgid "Reserved"
 msgstr "natanggap %s"
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3773,242 +3704,242 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4042,714 +3973,719 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, python-format
 msgid "Host %(host)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -4859,7 +4795,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -4870,7 +4806,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -4948,54 +4884,50 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5012,51 +4944,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5141,15 +5073,19 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 msgid "Failed storing info cache"
 msgstr ""
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -5263,103 +5199,103 @@ msgstr ""
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5454,38 +5390,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5520,7 +5456,7 @@ msgstr "natanggap %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5602,65 +5538,65 @@ msgstr ""
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5677,27 +5613,27 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5707,17 +5643,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr "natanggap %s"
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5790,11 +5726,91 @@ msgstr ""
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+msgid "Full set of CONF:"
+msgstr ""
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr ""
@@ -5933,57 +5949,62 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -6297,7 +6318,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6306,36 +6327,48 @@ msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:357
+#: nova/scheduler/filter_scheduler.py:361
 #, python-format
-msgid "Choosing host %(chosen_host)s"
+msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6530,46 +6563,46 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 msgid "memcached_servers not defined"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6622,58 +6655,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr ""
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 msgid "fake vswitch not found"
 msgstr ""
@@ -6707,17 +6724,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6726,7 +6743,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
@@ -6743,16 +6760,16 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 msgid "spawn error"
 msgstr ""
 
@@ -6848,6 +6865,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -6872,11 +6905,10 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -6996,19 +7028,19 @@ msgstr ""
 msgid "ipmitool stdout: '%(out)s', stderr: '%(err)s'"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7176,15 +7208,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7242,97 +7274,97 @@ msgstr ""
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7666,7 +7698,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7680,24 +7712,24 @@ msgstr ""
 msgid "Host IP address is: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8018,12 +8050,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8181,7 +8213,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8249,201 +8281,201 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8451,73 +8483,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8525,50 +8557,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8578,67 +8610,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8671,153 +8703,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, python-format
 msgid "Writing stored info to %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -8930,87 +8962,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9082,35 +9114,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
@@ -9201,74 +9233,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, python-format
 msgid "LPAR instance '%s' not found"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, python-format
 msgid "Instance '%s' failed to boot"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, python-format
 msgid "Shutting down the instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9724,7 +9756,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -9882,19 +9914,19 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -9998,24 +10030,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -10152,374 +10184,374 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10527,55 +10559,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -10589,193 +10628,202 @@ msgstr ""
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+msgid "Unable to terminate instance."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -10903,16 +10951,28 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 msgid "status must be 'in-use'"
 msgstr ""
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr ""
+
+#~ msgid "Got update to delete instance %(instance_uuid)s"
+#~ msgstr ""
+
diff --git a/nova/locale/tr/LC_MESSAGES/nova.po b/nova/locale/tr/LC_MESSAGES/nova.po
index f68449818..0e5c176ba 100644
--- a/nova/locale/tr/LC_MESSAGES/nova.po
+++ b/nova/locale/tr/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+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"
@@ -83,7 +83,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -167,8 +167,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -198,7 +198,7 @@ msgstr ""
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
@@ -1234,55 +1234,67 @@ msgstr ""
 
 #: nova/exception.py:1157
 #, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1293,7 +1305,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1313,205 +1325,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-msgid "Full set of CONF:"
-msgstr ""
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, python-format
-msgid "Starting %d workers"
-msgstr ""
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1596,130 +1528,125 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
@@ -1729,69 +1656,74 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, python-format
+msgid "Invalid IP protocol %s."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
@@ -1800,7 +1732,7 @@ msgstr ""
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
@@ -1810,7 +1742,7 @@ msgid "Detach Volume Failed."
 msgstr ""
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
@@ -1842,137 +1774,137 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2012,11 +1944,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr ""
@@ -2035,19 +1967,19 @@ msgstr ""
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -2059,63 +1991,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:364
+#: nova/api/openstack/common.py:366
 #, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -2169,14 +2101,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
 #: nova/api/openstack/extensions.py:370
 #, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2219,13 +2151,13 @@ msgstr ""
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr ""
 
@@ -2234,20 +2166,20 @@ msgstr ""
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, python-format
 msgid "Calling method %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2260,12 +2192,12 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2273,17 +2205,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2348,210 +2280,210 @@ msgstr ""
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, python-format
 msgid "Flavor '%s' could not be found "
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2559,9 +2491,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
+#: nova/api/openstack/compute/servers.py:1408
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+msgid "Removing options '%s' from query"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2648,7 +2580,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2668,17 +2600,17 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2830,15 +2762,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
@@ -2946,7 +2878,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -2979,29 +2911,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3220,33 +3152,33 @@ msgstr ""
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, python-format
 msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3265,94 +3197,93 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:838
-#, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+#: nova/cells/messaging.py:862
+msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3369,7 +3300,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3383,7 +3314,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3409,7 +3340,7 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, python-format
 msgid "Failed to load %s"
 msgstr ""
@@ -3429,270 +3360,270 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3772,242 +3703,242 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4041,714 +3972,719 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, python-format
 msgid "Host %(host)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -4858,7 +4794,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -4869,7 +4805,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -4947,54 +4883,50 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5011,51 +4943,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5140,15 +5072,19 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 msgid "Failed storing info cache"
 msgstr ""
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -5262,103 +5198,103 @@ msgstr ""
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5453,38 +5389,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5519,7 +5455,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5601,65 +5537,65 @@ msgstr ""
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5676,27 +5612,27 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5706,17 +5642,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5789,11 +5725,91 @@ msgstr ""
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+msgid "Full set of CONF:"
+msgstr ""
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr ""
@@ -5932,57 +5948,62 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -6296,7 +6317,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6305,36 +6326,48 @@ msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:357
+#: nova/scheduler/filter_scheduler.py:361
 #, python-format
-msgid "Choosing host %(chosen_host)s"
+msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6529,46 +6562,46 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 msgid "memcached_servers not defined"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6621,58 +6654,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr ""
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 msgid "fake vswitch not found"
 msgstr ""
@@ -6706,17 +6723,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6725,7 +6742,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
@@ -6742,16 +6759,16 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 msgid "spawn error"
 msgstr ""
 
@@ -6847,6 +6864,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -6871,11 +6904,10 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -6995,19 +7027,19 @@ msgstr ""
 msgid "ipmitool stdout: '%(out)s', stderr: '%(err)s'"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7175,15 +7207,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7241,97 +7273,97 @@ msgstr ""
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7665,7 +7697,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7679,24 +7711,24 @@ msgstr ""
 msgid "Host IP address is: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8017,12 +8049,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8180,7 +8212,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8248,201 +8280,201 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8450,73 +8482,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8524,50 +8556,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8577,67 +8609,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8670,153 +8702,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, python-format
 msgid "Writing stored info to %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -8929,87 +8961,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9081,35 +9113,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
@@ -9200,74 +9232,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, python-format
 msgid "LPAR instance '%s' not found"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, python-format
 msgid "Instance '%s' failed to boot"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, python-format
 msgid "Shutting down the instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9723,7 +9755,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -9881,19 +9913,19 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -9997,24 +10029,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -10151,374 +10183,374 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10526,55 +10558,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -10588,193 +10627,202 @@ msgstr ""
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+msgid "Unable to terminate instance."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -10902,16 +10950,28 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 msgid "status must be 'in-use'"
 msgstr ""
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr ""
+
+#~ msgid "Got update to delete instance %(instance_uuid)s"
+#~ msgstr ""
+
diff --git a/nova/locale/tr_TR/LC_MESSAGES/nova.po b/nova/locale/tr_TR/LC_MESSAGES/nova.po
index 0096cf357..469997621 100644
--- a/nova/locale/tr_TR/LC_MESSAGES/nova.po
+++ b/nova/locale/tr_TR/LC_MESSAGES/nova.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+0000\n"
 "PO-Revision-Date: 2013-02-02 18:03+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: en_US <LL@li.org>\n"
@@ -85,7 +85,7 @@ msgstr "Bayrakların yolu: %s"
 msgid "An unknown exception occurred."
 msgstr "Bilinmeyen bir istisna oluÅŸtu."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -169,8 +169,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr "Anahtar çifti verisi geçersiz"
 
@@ -200,7 +200,7 @@ msgstr ""
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Geçersiz port aralığı %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Geçersiz IP %(protocol)s."
@@ -1265,55 +1265,67 @@ msgstr "%(user_id)s kullanıcısı için %(name)s anahtar çifti bulunamadı"
 
 #: nova/exception.py:1157
 #, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "%(instance_id)s örneği kurtarma modunda değil"
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "%(instance_id)s örneği kurtarma modunda değil"
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1324,7 +1336,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr "Yetenekler zamanlayıcısı bildiriliyor ..."
 
@@ -1345,205 +1357,125 @@ msgstr "JSON dosyası ilkeyi temsil eder"
 msgid "Rule checked when requested rule is not found"
 msgstr "İstekte bulunan kural bulunamadığında kural kontrol edildi."
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-msgid "Full set of CONF:"
-msgstr ""
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr "%(flag)s : FLAG SET"
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, python-format
-msgid "Starting %d workers"
-msgstr ""
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr "%s servisi için tüketici bağlantısı oluşturuluyor."
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "Servis, hiç veritabanı girdisi olmayanı sonlandırdı."
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr "Çalışan komut(SSH): %s"
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr "SSH üzerinde ortam desteklenmemektedir."
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr "SSH üzerinde process_input desteklenmemektedir."
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr "Sonuç %s"
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Yerel adres bağlantısı bulunamadı.:%s"
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Geçersiz backend: %s"
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, fuzzy, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr "Bilinmeyen temel dosya: %s"
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Beklenen nesne türü: %s"
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Geçersiz server_string: %s"
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "Zaman Fonksiyonu: %(name)s %(total_time).2f saniye sürdü"
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, fuzzy, python-format
 msgid "%s is not a string or unicode"
 msgstr "%s güvenlik grubu string veya unicode değil"
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1628,7 +1560,7 @@ msgstr "Hata yakalayıcı: %s"
 msgid "Too many failed authentications."
 msgstr "Çok sayıda kimlik doğrulama başarısız oldu."
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
@@ -1637,124 +1569,119 @@ msgstr ""
 "%(access_key)s erişim anahtarı %(failures)d kez yanlış girildi ve "
 "%(lock_mins)d dakika boyunca kilitlenmiÅŸ olacak."
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr "Ä°mza verilmedi."
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr "Erişim anahtarı verilmedi."
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "Temel dosya kaldırılıyor: %s"
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "Çok sayıda kimlik doğrulama başarısız oldu."
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr "iÅŸlem: %s"
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s»»val: %(value)s"
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "%(controller)s kontrolcüsü ve %(action)s işlemi için izinsiz istek"
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "ÖrnekBulunamadı hatası: %s"
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "BölümBulunamadı hatası: %s"
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr "SistemAnlıkGörüntüsüBulunamadı hatası: %s"
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "Bulunamadı hatası: %s"
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr "EC2API hatası: %s"
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr "AnahtarÇiftiZatenVar hatası: %s"
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, fuzzy, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr "Geçersizİstek hatası: %s"
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr "GeçersizParametreDeğeri hatası: %s"
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr "GeçersizPortGenişliği hatası: %s"
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr "KimlikDoğrulama hatası: %s"
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr "Geçersizİstek hatası: %s"
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "BeklenmeyenHata: %s"
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr "Ortam: %s"
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "Bilinmeyen bir hata oluştu. Lütfen tekrar deneyin."
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "Desteklenmeyen API isteği: kontrolcü = %(controller)s, işlem = %(action)s"
@@ -1764,69 +1691,74 @@ msgstr "Desteklenmeyen API isteği: kontrolcü = %(controller)s, işlem = %(acti
 msgid "Create snapshot of volume %s"
 msgstr "Bölüm %s'in sistem anlık görüntüsünü oluştur"
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr "%s anahtar çiftini oluştur"
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr "%s anahtarını içeriye aktar"
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr "%s anahtar çiftini sil"
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, fuzzy, python-format
+msgid "Invalid IP protocol %s."
+msgstr "Geçersiz IP %(protocol)s."
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr "Belirlenmiş parametreler için hiç kural yok"
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "%s örneği için konsol çıktısını getir"
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "%s sistem görüntüsünden birim oluştur"
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "%s GB'lık birim oluştur"
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "%(device)s'daki %(instance_id)s örneğine %(volume_id)s birimini bağla"
@@ -1835,7 +1767,7 @@ msgstr "%(device)s'daki %(instance_id)s örneğine %(volume_id)s birimini bağla
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Birimi ayır %s"
@@ -1845,7 +1777,7 @@ msgid "Detach Volume Failed."
 msgstr ""
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "Özellik desteklenmiyor: %s"
@@ -1877,137 +1809,137 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "%(instance_id)s örneğine %(public_ip)s adresini ilişkilendir"
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Adresi kes %s"
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr "İmaj müsait olmak zorunda"
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr "Örnekleri sonlandırma işlemi başlatılıyor"
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr "%r örneğini tekrar yükle"
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr "Örnekler durdurulacak"
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr "Örnekler başlatılacak"
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr "%s imaj kaydı siliniyor"
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "%(image_id)s id ile %(image_location)s imajı kaydedildi"
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr "Kullanıcı veya grup belirlenmedi"
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr "Sadece \"all\" grubu destekleniyor"
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr "İşlem türü eklenmek veya kaldırılmak zorunda"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "%s imaj tanıtımı güncelleniyor"
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "%d saniye içinde örnek durdurulamadı"
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2048,11 +1980,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, fuzzy, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr "IP için metadata alma hata ile sonuçlandı: %s"
@@ -2071,12 +2003,12 @@ msgstr "%(url)s HTTP %(status)d ile geri döndü"
 msgid "Must specify an ExtensionManager class"
 msgstr "UzantıYöneticisi sınıfı belirlenmek zorunda"
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr "GeniÅŸletilmiÅŸ kaynak: %s"
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
@@ -2085,7 +2017,7 @@ msgstr ""
 "%(ext_name)s uzantısı: %(collection)s kaynağı genişletilemiyor: Böyle bir"
 " kaynak yok"
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr "%(ext_name)s uzantısı kaynağı genişletiyor: %(collection)s"
@@ -2097,63 +2029,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr "Sınır parametresi tam sayı olmak zorunda"
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr "Sınır parametresi pozitif olmak zorunda"
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr "Göreli konum parametresi tam sayı olmak zorunda"
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr "Göreli konum parametresi pozitif olmak zorunda"
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr " [%s] göstergesi bulunamadı"
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr "%s referansı versiyon içermiyor"
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr "İmaj üstveri sınırı aşıldı"
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr "Örnek %(attr)s %(state)s'de iken '%(action)s' yapılamaz"
 
-#: nova/api/openstack/common.py:364
-#, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+#: nova/api/openstack/common.py:366
+#, fuzzy, python-format
+msgid "Instance is in an invalid state for '%s'"
 msgstr "Örnek '%(action)s' için geçersiz durumda"
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr "Sistem görüntüsü isteği reddedildi, sistem görüntüleri şu anda devre dışı."
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr "Örnek sistem görüntüleri şu an onaylanmadı."
 
@@ -2207,14 +2139,14 @@ msgstr "Genişletme fabrikası çağırılıyor %s"
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "%(ext_factory)s uzantısı yüklemede hata: %(exc)s"
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "%(classpath)s uzantısı yüklemede hata: %(exc)s"
 
 #: nova/api/openstack/extensions.py:370
-#, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+#, fuzzy, python-format
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr "%(ext_name)s uzantısı yüklemede hata: %(exc)s"
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2257,13 +2189,13 @@ msgstr "İstekteki sağlayıcı gövdesi boş"
 msgid "There is no such action: %s"
 msgstr "Böyle bir işlem yok: %s"
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr "Kusurlu istek gövdesi"
 
@@ -2272,20 +2204,20 @@ msgstr "Kusurlu istek gövdesi"
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, python-format
 msgid "Calling method %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr "Desteklenmeyen içerik türü"
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr "Hatalı istek bağlantısı"
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2298,14 +2230,14 @@ msgstr "eleman çocuk değil"
 msgid "root element selecting a list"
 msgstr "listeden kök elemanı seçiliyor"
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 "Şablon ağacı uyumsuz; %(mastertag)s ana kaydına %(slavetag)s bağımlı "
 "birimi ekleniyor"
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr "alt sınıflar yapıcı() oluşturmak zorunda!"
 
@@ -2313,17 +2245,17 @@ msgstr "alt sınıflar yapıcı() oluşturmak zorunda!"
 msgid "Initializing extension manager."
 msgstr "Genişletme yöneticisi başlatılıyor"
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2388,217 +2320,217 @@ msgstr "Sunucu mevcut deÄŸil"
 msgid "Metadata item was not found"
 msgstr "İçerik özelliği bilgisi bulunamadı"
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr "Geçersiz değişiklik-oluşturma değeri"
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, fuzzy, python-format
 msgid "Flavor '%s' could not be found "
 msgstr "%(flavor_id)s örnek türü bulunamadı."
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr "Örnek bulunamadı."
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr "Yanlış kişisel biçim: %s bulunamadı"
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr "Yanlış kişisel biçim"
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr "%s için kişisel içerik çözümlenemedi"
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr "Yanlış ağ biçimi: ağ UUID'si uygun formatta değil(%s)"
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr "Geçersiz değişken IP adresi (%s)"
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr "Tekrarlanan aÄŸlara (%s) izin verilmiyor"
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr "Yanlış ağ biçimi: %s bulunamadı"
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr "Hatalı ağ biçimi"
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr "Kullanıcı verisi içeriği çözülemez"
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr "IPv4 adresi uygun IPv4 formatında değil"
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr "Sunucu adı tanımlanmadı"
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr "Geçersiz örnek türü sağlayıcısı"
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr "İstenilen imaj dosyası bulunamadı"
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr "Geçersiz anahtar adı verildi."
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "%s için kişisel içerik çözümlenemedi"
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr "Örnek tekrar boyutlandırılacak şekilde ayarlanmadı."
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "%(instance_id)s örneği bulunamadı."
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr "Önyükleme için argüman türü HARD veya SOFT değil"
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr "Önyükleme için tür argümanı eksik"
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr "İstenilen örnek türü konumlandırılamıyor."
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr "İmaj referans özelliği eksik"
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr "Geçersiz imaj referansı verildi."
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr "Örnek türü referans özelliği eksik"
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr "Belirlenmiş bir yönetici parolası yok"
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr "Geçersiz yönetici parolası"
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Örnek kapatmada hata oluştu."
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr "Çözümlenemeyen metadata anahtar/değer çifti."
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 "Yeniden boyutlandırma isteği geçersiz örnek türü referansı özelliğine "
 "sahip."
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 "Yeniden boyutlandırma isteği geçersiz örnek türü referansı özelliği "
 "gerektirir."
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr "Geçersiz istek gövdesi"
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr "İstekte bulunulan imaj referansı çözümlenemedi."
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr "Yeniden kurulum için imaj dosyası bulunamadı."
 
@@ -2606,9 +2538,9 @@ msgstr "Yeniden kurulum için imaj dosyası bulunamadı."
 msgid "createImage entity requires name attribute"
 msgstr "createImage varlığının isim özelliğine ihtiyacı var"
 
-#: nova/api/openstack/compute/servers.py:1409
-#, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+#: nova/api/openstack/compute/servers.py:1408
+#, fuzzy, python-format
+msgid "Removing options '%s' from query"
 msgstr "Sorgudan '%(unk_opt_str)s' seçenekleri kaldırılıyor"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2696,7 +2628,7 @@ msgstr "Sunucu ve blok_göçü tanımlanmak zorunda."
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, fuzzy, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr "%(id)s'dan %(host)s sunucusuna örnek göçü hatalı"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2716,17 +2648,17 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2887,16 +2819,16 @@ msgstr "Kümeler %s işlemine sahip değil"
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr "%s 'MANUAL' veya 'AUTO' olmak zorunda"
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 #, fuzzy
 msgid "host and onSharedStorage must be specified."
 msgstr "Sunucu ve blok_göçü tanımlanmak zorunda."
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, fuzzy, python-format
 msgid "Error in evacuate, %s"
 msgstr "Göçte hata %s"
@@ -3006,7 +2938,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "%(address)s deÄŸiÅŸken IP adresi iliÅŸkilendirilemedi."
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3040,29 +2972,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Sunucu durumu güncelleniyor"
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3288,33 +3220,33 @@ msgstr "birim=%s"
 msgid "Delete volume with id: %s"
 msgstr "%s id'li birim siliniyor"
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, python-format
 msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, fuzzy, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr "Yanlış ağ biçimi: ağ UUID'si uygun formatta değil(%s)"
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr "%(device)s'daki %(server_id)s örneğine %(volume_id)s birimi ekleniyor"
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr "%s id'li sistem görüntüsü siliniyor"
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr "%s biriminden sistem görüntüsü oluşturuluyor"
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3333,94 +3265,94 @@ msgstr "%s adresini serbest bırak"
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, fuzzy, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr "%(ext_factory)s uzantısı yüklemede hata: %(exc)s"
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, fuzzy, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
-msgstr "%(status)s durumuyla %(instance_id)s örneği için göç bulunamadı."
+msgid "Got update for instance: %(instance)s"
+msgstr "%(instance_id)s örneği için ağ bulunamadı."
 
-#: nova/cells/messaging.py:838
+#: nova/cells/messaging.py:862
 #, fuzzy, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+msgid "Got update to delete instance"
 msgstr "%(instance_id)s örneği için ağ bulunamadı."
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3437,7 +3369,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "%(instance_id)s örneği için ağ bulunamadı."
@@ -3451,7 +3383,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3477,7 +3409,7 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, python-format
 msgid "Failed to load %s"
 msgstr ""
@@ -3497,277 +3429,277 @@ msgstr "eleman çocuk değil"
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Veritabanı hatası: %s"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 #, fuzzy
 msgid "IP address"
 msgstr "Başlangıç adresi"
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 #, fuzzy
 msgid "No fixed IP found."
 msgstr "Hiç dinamik IP bulunamadı."
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, fuzzy, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr "Örnekle değişken IP ilişkilendirilmedi"
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr "id"
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr "IPv4"
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr "IPv6"
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "Başlangıç adresi"
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr "DNS1"
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr "DNS2"
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr "VlanID"
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr "proje"
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr "uuid"
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 #, fuzzy
 msgid "No networks found"
 msgstr "Ağ bulunamadı"
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "AÄŸ oluÅŸturulurken %(req)s gereklidir."
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 #, fuzzy
 msgid "instance"
 msgstr "%r örneğini tekrar yükle"
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "%(service_id)s servisi bulunamadı."
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "%(service_id)s servisi bulunamadı."
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "BeklenmeyenHata: %s"
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 #, fuzzy
 msgid "PROJECT"
 msgstr "proje"
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3851,115 +3783,115 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Örnekleri sonlandırma işlemi başlatılıyor"
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "%(instance_type_id)s örnek türü bulunamadı"
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Örnekleri sonlandırma işlemi başlatılıyor"
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -3968,129 +3900,129 @@ msgstr ""
 "Eski örnek türü %(current_instance_type_name)s, yeni örnek türü "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr "Anahtar çifti adı 1-255 karakter arası uzunluğunda olmak zorunda"
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr "%s güvenlik grubu string veya unicode değil"
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "%s güvenlik grubu boş bırakılamaz."
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr "%s güvenlik grubu 255 karakterden fazla olmamalıdır."
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr "%s güvenlik grubunu oluşturunuz"
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr "%s güvenlik grubu zaten var"
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Kural (%s) bulunamadı"
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Yetkilendirilmiş %s güvenlik grubu girişi"
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "%s güvenlik grubu girişini iptal et"
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr "Güvenlik grup id'si integer olmak zorunda"
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4124,217 +4056,217 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
+#, python-format
+msgid "'%s' argument must be greater than 0"
+msgstr ""
+
+#: nova/compute/flavors.py:108
 #, fuzzy, python-format
-msgid "'%s' argument must be a positive integer"
-msgstr "Göreli konum parametresi tam sayı olmak zorunda"
+msgid "'%s' argument must be greater than or equal to 0"
+msgstr "yedekOluşturma 'dönüşme' özelliği tamsayı olmak zorunda"
 
-#: nova/compute/flavors.py:113
+#: nova/compute/flavors.py:117
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
-msgstr ""
-
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr "Veritabanı hatası: %s"
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr "Silme işlemi için %s örnek türü bulunamadı"
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr "Mevcut (%(host)s) sunucusundan (%(instance_id)s) örneği geçirilemez."
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr "Mevcut durum %(drv_state)s, veritabanındaki durum %(db_state)s."
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Örnek kapatmada hata oluştu."
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Misafir sistem sürücüsü güvenlik duvarı kurallarını desteklemiyor"
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "BeklenmeyenHata: %s"
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr "Durum kontrol ediliyor"
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "%s blok aygıt haritalandırması ayarlanıyor"
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "Örnek oluşturmada hata"
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Veritabanı hatası: %s"
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
@@ -4343,7 +4275,7 @@ msgstr ""
 "Ä°maj id=%(image_id)s, Ä°maj boyutu=%(size_bytes)d, Ä°zin verilen "
 "boyut=%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
@@ -4352,415 +4284,415 @@ msgstr ""
 "İmaj '%(image_id)s' boyut%(size_bytes)d izin verilen örnek  "
 "%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr "Örnek başlatılıyor.."
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr "Ağ kurulumundaki örnek başarısız"
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "Örnek ağ_bilgisi: |%s|"
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr "Örnek blok aygıtı kurulumu hatalı"
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr "Örnek oluşturmada hata"
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr "Örnek için ağ serbest bırakılıyor"
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s örneği"
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Örnek için ağ serbest bırakılıyor"
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "DiskBulunamadı yok sayılıyor: %s"
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr "Blok cihazı haritalandırması kapatılıyor %s"
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Birimi ayır %s"
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "%(num_images)d tane imaj bulundu(dönüş: %(rotation)d)"
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr "Ä°maj siliniyor %s"
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "Yönetici parolası oluşturmada hata. %s örneği çalışmıyor."
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Örnek kapatmada hata oluştu."
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Veritabanı hatası: %s"
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Örneğin hiç bölümü yok."
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr "dedef kaynak ile aynı!"
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Konsol ekleniyor"
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr "%(mountpoint)s'de %(volume_id)s bölümü ön yükleniyor"
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr "%(mountpoint)s'e %(volume_id)s bölümü bağlanıyor"
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr "%(mp)s bağlama noktasındaki %(volume_id)s bölümü ayrılıyor"
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "%(mp)s bağlama noktasındaki %(volume_id)s bölümü ayrılıyor"
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, fuzzy, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr "%(volume_id)s bölümü hiçbir şeyle ilişkilendirilmedi"
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, fuzzy, python-format
 msgid "Host %(host)s not found"
 msgstr "%(host)s sunucusu bulunamadı."
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr "Güncel göç işlemi %(dest)s'da bir hata ile karşılaştı"
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr "%(dest)s'a örnek göçü işlemi başarıyla tamamlandı."
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr "Bant genişliği kullanım önbelleği güncelleniyor"
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Bant genişliği kullanım önbelleği güncelleniyor"
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr "Sunucu durumu güncelleniyor"
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -4769,83 +4701,88 @@ msgstr ""
 "Veritabanında %(num_db_instances)s ve misafir sistemde "
 "%(num_vm_instances)s bulundu"
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr "Silinen örnek kurtarılıyor"
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Ä°maj siliniyor %s"
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -4956,7 +4893,7 @@ msgstr "%s örneği için sunucu bulma başarısız"
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -4967,7 +4904,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -5046,56 +4983,52 @@ msgstr "Anahtar kontrol edliyor: %(token)s, %(token_valid)s)"
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 #, fuzzy
 msgid "Failed to notify cells of instance update"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 #, fuzzy
 msgid "Failed to notify cells of instance fault"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "Tanınmayan silinmiş okuma değeri '%s'"
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "%s geçerli bir örnek ismidir"
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5112,51 +5045,51 @@ msgstr "Sürüm tam sayı olmak zorunda"
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5241,16 +5174,20 @@ msgstr "Global ipv6 için yanlış sonek: %s"
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr "Global ipv6 için yanlış proje numarası: %s"
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 #, fuzzy
 msgid "Failed storing info cache"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -5364,103 +5301,103 @@ msgstr "Bu türücü sadece 'a' türü girdileri destekliyor."
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr "Var olmayan %s zinciri kaldırılmaya çalışılıyor"
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr "Tanınmayan zincir: %r"
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "%d süreç numarası bozuldu, radvd tekrar başlatılıyor"
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "%s VLAN arayüzü başlatılıyor "
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "%s köprüsü koruma altına alınıyor"
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "%(vlan)s vlan ve %(bridge)s köprüsü koruma altına alınıyor"
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5555,38 +5492,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5622,7 +5559,7 @@ msgstr "sil: %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr "miras nw_info için v4 alt ağları gerekiyor"
 
@@ -5705,70 +5642,70 @@ msgstr ""
 msgid "Quantum Error creating security group %s"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Yakalama hatası: %s"
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Güvenlik grup id'si integer olmak zorunda"
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Yakalama hatası: %s"
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "%(rule_id)s kurallı güvenlik grubu bulunamadı."
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, fuzzy, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 "%(project_id)s projesi için %(security_group_id)s güvenlik grubu "
 "bulunamadı."
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5787,27 +5724,27 @@ msgstr "Bu kural zaten grupta var %s"
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5817,17 +5754,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr "sil: %s"
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr "syslog servisi bunlardan biri olmak zorundadır: %s"
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5900,11 +5837,91 @@ msgstr "utils.execute için bilinmeyen anahtar kelime argümanları: %r"
 msgid "Running cmd (subprocess): %s"
 msgstr "Çalışan komut(alt süreç): %s"
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr "Sonuç %s"
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r hatalı. Yeniden deneniyor."
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr "Çalışan komut(SSH): %s"
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr "SSH üzerinde ortam desteklenmemektedir."
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr "SSH üzerinde process_input desteklenmemektedir."
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+msgid "Full set of CONF:"
+msgstr ""
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr "Veritabanı istisnası yakalandı."
@@ -6043,57 +6060,62 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr "Geçersi RPC bağlantısı kullanımı."
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, fuzzy, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr "%(base_file)s dosyasını kaldırma başarısız, %(error)s"
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -6408,7 +6430,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6416,37 +6438,49 @@ msgid ""
 msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+#, fuzzy, python-format
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr "%(num_instances)d örnek(leri) kurulmaya çalışılıyor."
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, fuzzy, python-format
+msgid "Request Spec: %s"
+msgstr "Geçersizİstek hatası: %s"
+
+#: nova/scheduler/filter_scheduler.py:97
+#, fuzzy, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr "%(instance_id)s örneği için ağ bulunamadı."
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "%(hosts)s filtrelendi"
 
-#: nova/scheduler/filter_scheduler.py:357
-#, python-format
-msgid "Choosing host %(chosen_host)s"
-msgstr ""
+#: nova/scheduler/filter_scheduler.py:361
+#, fuzzy, python-format
+msgid "Weighed %(hosts)s"
+msgstr "%(hosts)s filtrelendi"
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr "Mevcut (%(host)s) sunucusundan (%(instance_id)s) örneği geçirilemez."
@@ -6641,47 +6675,47 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr "Kurtarılmış model sunucu bağlantısı!"
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr "Model sunucusu gitti."
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 #, fuzzy
 msgid "memcached_servers not defined"
 msgstr "Sunucu adı tanımlanmadı"
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6734,60 +6768,44 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr ""
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr "Komutun(alt sürecin) taklit çalıştırılması: %s"
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr "Sahte komut eÅŸleÅŸti %s"
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr "Sahte komut bir istisna fırlattı %s"
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 "Sahte komuta verilen yanıt: standartçıktı='%(stdout)s' "
 "standarthata='%(stderr)s'"
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr "Lütfen sahte libvirt modülü desteklenen bayraklar için genişletiniz"
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 #, fuzzy
 msgid "fake vswitch not found"
@@ -6822,17 +6840,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6841,7 +6859,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr "Örnekler çalışıyor: %s"
@@ -6858,16 +6876,16 @@ msgstr "Örnekleri sonlandırmanın ardından: %s"
 msgid "Internal error"
 msgstr "İçsel hata"
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "Zorla öldürülen örneklerin ardından: %s"
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 #, fuzzy
 msgid "spawn error"
 msgstr "Kimlik doğrulama hatası"
@@ -6967,6 +6985,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr "Lütfen sahte libvirt modülü desteklenen bayraklar için genişletiniz"
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -6991,11 +7025,11 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+#, fuzzy
+msgid "Unable to load the virtualization driver"
 msgstr "Sanallaştırma sürücüsü yükleme başarısız: %s"
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -7118,19 +7152,19 @@ msgstr ""
 "Sahte komuta verilen yanıt: standartçıktı='%(stdout)s' "
 "standarthata='%(stderr)s'"
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7299,15 +7333,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7366,97 +7400,97 @@ msgstr ""
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7790,7 +7824,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7804,24 +7838,24 @@ msgstr ""
 msgid "Host IP address is: %s"
 msgstr "%s adresini serbest bırak"
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8144,12 +8178,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "|%s| örneği için değişken IP tahsisi"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8308,7 +8342,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8376,204 +8410,204 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Örnekler durdurulacak"
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Tanımlı bir ağ yok."
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Tanımlı bir ağ yok."
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8581,73 +8615,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8655,21 +8689,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -8678,29 +8712,29 @@ msgstr ""
 "Diğer hesaplama düğümlerini haberdar etmek için %s geçici dosyası "
 "oluşturuluyor. Düğümler aynı belleğe bağlanmalıdır."
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr "Blok göçü paylaşılan hafıza ile kullanılamaz."
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8715,7 +8749,7 @@ msgstr ""
 " \n"
 " Bkz: %(u)s"
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -8724,62 +8758,62 @@ msgstr ""
 "Diğer hesaplama düğümlerini haberdar etmek için %s geçici dosyası "
 "oluşturuluyor. Düğümler aynı belleğe bağlanmalıdır."
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, fuzzy, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 "plug_vifs() %(cnt)d kez başarısız oldu. %(hostname)s için %(max_retry)d "
 "denemeye kadar tekrar deneniyor."
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr "Birim gibi göründüğünden beri %(path)s atlanıyor"
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8812,46 +8846,46 @@ msgstr "%(name)s için (%(instance_filter_name)s) ağ filtresi bulunamadı."
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptabloları güvenlik duvarı: Temel Filtreleme Kurulumu"
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, python-format
 msgid "Writing stored info to %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr "%s geçerli bir örnek ismidir"
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr "%s bir disk dosyasına sahiptir"
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr "%(instance)s örneği %(backing)s tarafından desteklenmiştir"
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
@@ -8860,107 +8894,107 @@ msgstr ""
 "%(instance)s örneği imaj servisinde görünmeyen bir %(backing)s destek "
 "dosyasını kullanıyor"
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr "Temel dosya kaldırmak için çok yeni: %s"
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr "Temel dosya kaldırılıyor: %s"
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr "%(base_file)s dosyasını kaldırma başarısız, %(error)s"
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr "Doğrulama atlanıyor, %s'de temel dizin yok"
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr "Temel imajları doğrulayın"
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr "Bilinmeyen temel dosya: %s"
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr "Aktif temel dosyalar: %s"
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr "Bozuk temel dosyalar: %s"
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr "Taşınabilir temel dosyalar: %s"
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr "Doğrulama tamamlandı"
 
@@ -9073,88 +9107,88 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr "%s'de iSCSI cihazı bulunamadı"
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, fuzzy, python-format
 msgid "AoE device not found at %s"
 msgstr "%s'de iSCSI cihazı bulunamadı"
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 #, fuzzy
 msgid "Fibre Channel device not found."
 msgstr "%s'de iSCSI cihazı bulunamadı"
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9226,35 +9260,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, fuzzy, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr "Çalışan komut(alt süreç): %s"
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
@@ -9345,74 +9379,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, python-format
 msgid "LPAR instance '%s' not found"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, python-format
 msgid "Instance '%s' failed to boot"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, python-format
 msgid "Shutting down the instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9868,7 +9902,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -10028,19 +10062,19 @@ msgstr "Geçersiz bölüm"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -10144,24 +10178,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -10298,374 +10332,374 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10673,55 +10707,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -10735,195 +10776,205 @@ msgstr ""
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+#, fuzzy
+msgid "Unable to terminate instance."
+msgstr "Örnek tür oluşturulamıyor."
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 #, fuzzy
 msgid "Destroying VDIs"
 msgstr "XVP tekar başlatılıyor"
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 #, fuzzy
 msgid "No suitable network for migrate"
 msgstr "Hatalı ağ biçimi"
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -11052,18 +11103,27 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 #, fuzzy
 msgid "status must be 'in-use'"
 msgstr "İmaj müsait olmak zorunda"
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 #, fuzzy
 msgid "status must be 'available'"
 msgstr "İmaj müsait olmak zorunda"
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr "%(flag)s : FLAG SET"
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr "%(status)s durumuyla %(instance_id)s örneği için göç bulunamadı."
+
diff --git a/nova/locale/uk/LC_MESSAGES/nova.po b/nova/locale/uk/LC_MESSAGES/nova.po
index dcaa62149..3f680d660 100644
--- a/nova/locale/uk/LC_MESSAGES/nova.po
+++ b/nova/locale/uk/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+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"
@@ -84,7 +84,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -168,8 +168,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -199,7 +199,7 @@ msgstr ""
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
@@ -1235,55 +1235,67 @@ msgstr ""
 
 #: nova/exception.py:1157
 #, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1294,7 +1306,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1314,205 +1326,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-msgid "Full set of CONF:"
-msgstr ""
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, python-format
-msgid "Starting %d workers"
-msgstr ""
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1597,131 +1529,126 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr "Занадто багато невдалих аутентифікацій."
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "Занадто багато невдалих аутентифікацій."
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
@@ -1731,69 +1658,74 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, python-format
+msgid "Invalid IP protocol %s."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Це правило вже і�нує в групі %s"
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Створити розділ на %s ГБ"
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
@@ -1802,7 +1734,7 @@ msgstr ""
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Від'єднати том %s"
@@ -1813,7 +1745,7 @@ msgid "Detach Volume Failed."
 msgstr "Від'єднати том %s"
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
@@ -1845,137 +1777,137 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr "лише група \"в�і\" підтримуєть��"
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2015,11 +1947,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr ""
@@ -2038,19 +1970,19 @@ msgstr ""
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -2062,63 +1994,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:364
+#: nova/api/openstack/common.py:366
 #, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -2172,14 +2104,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
 #: nova/api/openstack/extensions.py:370
 #, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2222,13 +2154,13 @@ msgstr ""
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr ""
 
@@ -2237,20 +2169,20 @@ msgstr ""
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, fuzzy, python-format
 msgid "Calling method %s"
 msgstr "Оголошенн� черги %s"
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2263,12 +2195,12 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2276,17 +2208,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2351,210 +2283,210 @@ msgstr ""
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, python-format
 msgid "Flavor '%s' could not be found "
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2562,9 +2494,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
+#: nova/api/openstack/compute/servers.py:1408
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+msgid "Removing options '%s' from query"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2651,7 +2583,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2671,17 +2603,17 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2833,15 +2765,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
@@ -2949,7 +2881,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -2982,29 +2914,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Оголошенн� черги %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Оголошенн� черги %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3224,33 +3156,33 @@ msgstr ""
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, python-format
 msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3269,94 +3201,93 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "без пор�дку дл� повідомлень: %s"
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "без пор�дку дл� повідомлень: %s"
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:838
-#, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+#: nova/cells/messaging.py:862
+msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3373,7 +3304,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3387,7 +3318,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3413,7 +3344,7 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, python-format
 msgid "Failed to load %s"
 msgstr ""
@@ -3433,271 +3364,271 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 #, fuzzy
 msgid "Reserved"
 msgstr "отримано %s"
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3777,242 +3708,242 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4046,715 +3977,720 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Від'єднати том %s"
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, python-format
 msgid "Host %(host)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Від'єднати том %s"
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Від'єднати том %s"
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -4864,7 +4800,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -4875,7 +4811,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -4953,54 +4889,50 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5017,51 +4949,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5146,15 +5078,19 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 msgid "Failed storing info cache"
 msgstr ""
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -5268,103 +5204,103 @@ msgstr ""
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5459,38 +5395,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5525,7 +5461,7 @@ msgstr "отримано %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5607,66 +5543,66 @@ msgstr ""
 msgid "Quantum Error creating security group %s"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5683,27 +5619,27 @@ msgstr "Це правило вже і�нує в групі %s"
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5713,17 +5649,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr "отримано %s"
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5796,11 +5732,91 @@ msgstr ""
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+msgid "Full set of CONF:"
+msgstr ""
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr ""
@@ -5939,57 +5955,62 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -6303,7 +6324,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6312,36 +6333,48 @@ msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:357
+#: nova/scheduler/filter_scheduler.py:361
 #, python-format
-msgid "Choosing host %(chosen_host)s"
+msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6536,46 +6569,46 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 msgid "memcached_servers not defined"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6628,58 +6661,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr ""
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 msgid "fake vswitch not found"
 msgstr ""
@@ -6713,17 +6730,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6732,7 +6749,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
@@ -6749,16 +6766,16 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 msgid "spawn error"
 msgstr ""
 
@@ -6854,6 +6871,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -6878,11 +6911,10 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -7002,19 +7034,19 @@ msgstr ""
 msgid "ipmitool stdout: '%(out)s', stderr: '%(err)s'"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7182,15 +7214,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7248,97 +7280,97 @@ msgstr ""
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7672,7 +7704,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7686,24 +7718,24 @@ msgstr ""
 msgid "Host IP address is: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8024,12 +8056,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8187,7 +8219,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8255,201 +8287,201 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8457,73 +8489,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8531,50 +8563,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8584,67 +8616,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8677,153 +8709,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, python-format
 msgid "Writing stored info to %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -8936,87 +8968,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9088,35 +9120,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
@@ -9207,74 +9239,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, python-format
 msgid "LPAR instance '%s' not found"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, python-format
 msgid "Instance '%s' failed to boot"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, python-format
 msgid "Shutting down the instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9730,7 +9762,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -9888,19 +9920,19 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -10004,24 +10036,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -10158,374 +10190,374 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "без пор�дку дл� повідомлень: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10533,55 +10565,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -10595,193 +10634,202 @@ msgstr ""
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+msgid "Unable to terminate instance."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -10910,16 +10958,28 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 msgid "status must be 'in-use'"
 msgstr ""
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr ""
+
+#~ msgid "Got update to delete instance %(instance_uuid)s"
+#~ msgstr ""
+
diff --git a/nova/locale/vi_VN/LC_MESSAGES/nova.po b/nova/locale/vi_VN/LC_MESSAGES/nova.po
index d45a6e21f..dbfe7075b 100644
--- a/nova/locale/vi_VN/LC_MESSAGES/nova.po
+++ b/nova/locale/vi_VN/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Nova\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/nova\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+0000\n"
 "PO-Revision-Date: 2013-05-13 19:22+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Vietnamese (Viet Nam) "
@@ -84,7 +84,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -168,8 +168,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -199,7 +199,7 @@ msgstr ""
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
@@ -1235,55 +1235,67 @@ msgstr ""
 
 #: nova/exception.py:1157
 #, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1294,7 +1306,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1314,205 +1326,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-msgid "Full set of CONF:"
-msgstr ""
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, python-format
-msgid "Starting %d workers"
-msgstr ""
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1597,130 +1529,125 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
@@ -1730,69 +1657,74 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, python-format
+msgid "Invalid IP protocol %s."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
@@ -1801,7 +1733,7 @@ msgstr ""
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
@@ -1811,7 +1743,7 @@ msgid "Detach Volume Failed."
 msgstr ""
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
@@ -1843,137 +1775,137 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2013,11 +1945,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr ""
@@ -2036,19 +1968,19 @@ msgstr ""
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -2060,63 +1992,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:364
+#: nova/api/openstack/common.py:366
 #, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -2170,14 +2102,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
 #: nova/api/openstack/extensions.py:370
 #, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2220,13 +2152,13 @@ msgstr ""
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr ""
 
@@ -2235,20 +2167,20 @@ msgstr ""
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, python-format
 msgid "Calling method %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2261,12 +2193,12 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2274,17 +2206,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2349,210 +2281,210 @@ msgstr ""
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, python-format
 msgid "Flavor '%s' could not be found "
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2560,9 +2492,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
+#: nova/api/openstack/compute/servers.py:1408
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+msgid "Removing options '%s' from query"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2649,7 +2581,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2669,17 +2601,17 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2831,15 +2763,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
@@ -2947,7 +2879,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -2980,29 +2912,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3221,33 +3153,33 @@ msgstr ""
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, python-format
 msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3266,94 +3198,93 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:838
-#, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+#: nova/cells/messaging.py:862
+msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3370,7 +3301,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3384,7 +3315,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3410,7 +3341,7 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, python-format
 msgid "Failed to load %s"
 msgstr ""
@@ -3430,270 +3361,270 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3773,242 +3704,242 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4042,714 +3973,719 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, python-format
 msgid "Host %(host)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -4859,7 +4795,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -4870,7 +4806,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -4948,54 +4884,50 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5012,51 +4944,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5141,15 +5073,19 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 msgid "Failed storing info cache"
 msgstr ""
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -5263,103 +5199,103 @@ msgstr ""
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5454,38 +5390,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5520,7 +5456,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5602,65 +5538,65 @@ msgstr ""
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5677,27 +5613,27 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5707,17 +5643,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5790,11 +5726,91 @@ msgstr ""
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+msgid "Full set of CONF:"
+msgstr ""
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr ""
@@ -5933,57 +5949,62 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -6297,7 +6318,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6306,36 +6327,48 @@ msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:357
+#: nova/scheduler/filter_scheduler.py:361
 #, python-format
-msgid "Choosing host %(chosen_host)s"
+msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6530,46 +6563,46 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 msgid "memcached_servers not defined"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6622,58 +6655,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr ""
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 msgid "fake vswitch not found"
 msgstr ""
@@ -6707,17 +6724,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6726,7 +6743,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
@@ -6743,16 +6760,16 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 msgid "spawn error"
 msgstr ""
 
@@ -6848,6 +6865,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -6872,11 +6905,10 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -6996,19 +7028,19 @@ msgstr ""
 msgid "ipmitool stdout: '%(out)s', stderr: '%(err)s'"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7176,15 +7208,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7242,97 +7274,97 @@ msgstr ""
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7666,7 +7698,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7680,24 +7712,24 @@ msgstr ""
 msgid "Host IP address is: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8018,12 +8050,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8181,7 +8213,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8249,201 +8281,201 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8451,73 +8483,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8525,50 +8557,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8578,67 +8610,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8671,153 +8703,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, python-format
 msgid "Writing stored info to %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -8930,87 +8962,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9082,35 +9114,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
@@ -9201,74 +9233,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, python-format
 msgid "LPAR instance '%s' not found"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, python-format
 msgid "Instance '%s' failed to boot"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, python-format
 msgid "Shutting down the instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9724,7 +9756,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -9882,19 +9914,19 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -9998,24 +10030,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -10152,374 +10184,374 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10527,55 +10559,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -10589,193 +10628,202 @@ msgstr ""
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+msgid "Unable to terminate instance."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -10903,16 +10951,28 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 msgid "status must be 'in-use'"
 msgstr ""
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr ""
+
+#~ msgid "Got update to delete instance %(instance_uuid)s"
+#~ msgstr ""
+
diff --git a/nova/locale/zh_CN/LC_MESSAGES/nova.po b/nova/locale/zh_CN/LC_MESSAGES/nova.po
index 3e0a9b0e5..ca2edca6f 100644
--- a/nova/locale/zh_CN/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_CN/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+0000\n"
 "PO-Revision-Date: 2012-05-07 06:51+0000\n"
 "Last-Translator: Edward <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
@@ -85,7 +85,7 @@ msgstr "标记所在路径：%s"
 msgid "An unknown exception occurred."
 msgstr "�生未知异常。"
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -170,8 +170,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr "密钥对数�无效"
 
@@ -202,7 +202,7 @@ msgstr "无效的元数�键"
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "无效的端�范围 %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "无效的IP�议 %(protocol)s。"
@@ -1250,57 +1250,69 @@ msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "密钥对 %(name)s 没有为用户 %(user_id)s 找到。"
 
 #: nova/exception.py:1157
+#, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "没有为项目 %(project_id)s 找到��。"
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "项目 %(project_id)s 没有找到。"
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "该驱动�能执行set_admin_password。"
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "实例 %(instance_id)s �在救�模�。"
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "实例 %(instance_id)s �在救�模�。"
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1311,7 +1323,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr "�调度器通报能力。"
 
@@ -1332,206 +1344,125 @@ msgstr "JSON文件表示策略。"
 msgid "Rule checked when requested rule is not found"
 msgstr "请求的规则找�到时的检查缺�规则。"
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-#, fuzzy
-msgid "Full set of CONF:"
-msgstr "标记全集："
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr "%(flag)s：标记集� "
-
-#: nova/service.py:214 nova/service.py:312
-#, fuzzy, python-format
-msgid "Caught %s, exiting"
-msgstr "快照 %s：正在删除"
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, fuzzy, python-format
-msgid "Starting %d workers"
-msgstr "起始地�"
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, fuzzy, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr "�动 %(topic)s 节点 (版本 %(vcs_string)s)"
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr "为�务 %s 创建消费者"
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "因无数�库记录，�务已被中止"
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr "�行cmd (SSH)：%s"
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr "SSH上�支�环境��"
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr "SSH上�支�的进程输入�数。"
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr "�行结果为 %s"
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr "回调中debug：%s"
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "本地IP地�没有找到：%s"
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "无法连接到 %(interface)s 的本地IP：%(ex)s"
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "无效的��：%s"
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, fuzzy, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr "未知的基文件：%s"
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "期望的对象类型：%s"
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "�正确的server_string：%s"
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc：'%(name)s' 用了%(total_time).2f 秒"
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, fuzzy, python-format
 msgid "Reloading cached file %s"
 msgstr "正在删除基文件：%s"
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "移除容器失败：%s"
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, fuzzy, python-format
 msgid "%s is not a string or unicode"
 msgstr "�务器�称�是字符串或者unicode"
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, fuzzy, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr "密钥对�称长度必须在1到255个字符之间"
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1616,131 +1547,126 @@ msgstr "FaultWrapper: %s"
 msgid "Too many failed authentications."
 msgstr "认�失败过多"
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr "访问密钥 %(access_key)s 有错误 %(failures)d，认�失败将被�定 %(lock_mins)d 分钟。"
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr "签�没有�供"
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr "访问密钥没有�供"
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr "与keystone交�失败"
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "预在线�移在%(dest)s失败"
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "认�失败过多"
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr "执行: %s"
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\tval: %(value)s"
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "为controller=%(controller)s 以� action=%(action)s未验�的请求"
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "引起异常 InstanceNotFound: %s"
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "引起异常 VolumeNotFound: %s"
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr "引起异常 SnapshotNotFound: %s"
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "引起异常 NotFound: %s"
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr "引起异常 EC2APIError: %s"
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr "引起异常 KeyPairExists: %s"
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, fuzzy, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr "引起异常 InvalidRequest: %s"
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr "引起异常 InvalidParameterValue: %s"
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr "引起异常 InvalidPortRange: %s"
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr "引起异常 NotAuthorized: %s"
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr "引起异常 InvalidRequest: %s"
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "引起�外的错误：%s"
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "引起�外的错误：%s"
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr "Environment: %s"
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "�生了一个未知的错误. 请�试你的请求."
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "�支�的API请求：controller = %(controller)s，action = %(action)s"
@@ -1750,70 +1676,75 @@ msgstr "�支�的API请求：controller = %(controller)s，action = %(action)
 msgid "Create snapshot of volume %s"
 msgstr "创建� %s 的快照"
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "解密�钥失败：%s"
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr "创建密钥对 %s"
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr "导入密钥 %s"
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr "删除密钥对 %s"
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "�数�够创建有效规则。"
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, fuzzy, python-format
+msgid "Invalid IP protocol %s."
+msgstr "无效的IP�议 %(protocol)s。"
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr "对给定的�数无特定规则。"
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "这�规则已�存在于组%s 中"
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "获�实例 %s 控制�输出"
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "从快照 %s 创建�"
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "创建 %s GB的�"
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 #, fuzzy
 msgid "Delete Failed"
 msgstr "创建失败"
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "把� %(volume_id)s 附加到实例 %(instance_id)s 上�置在 %(device)s"
@@ -1823,7 +1754,7 @@ msgstr "把� %(volume_id)s 附加到实例 %(instance_id)s 上�置在 %(devi
 msgid "Attach Failed."
 msgstr "创建失败"
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "分离� %s"
@@ -1834,7 +1765,7 @@ msgid "Detach Volume Failed."
 msgstr "分离� %s"
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "属性�支�: %s"
@@ -1868,145 +1799,145 @@ msgstr "无法找到地� %r"
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "把地� %(public_ip)s 关�到实例 %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "无法找到地� %r"
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, fuzzy, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr "存在多个固定IP，使用第一个：%s"
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 #, fuzzy
 msgid "Floating ip is already associated."
 msgstr "浮动ip %(address)s 已被关�。"
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 #, fuzzy
 msgid "l3driver call to add floating ip failed."
 msgstr "没有浮动IP�用。"
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "无法找到地� %r"
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr "�消地� %s 的关�"
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 #, fuzzy
 msgid "Floating ip is not associated."
 msgstr "浮动ip %(address)s 没有被关�。"
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr "镜�必须�用。"
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr "准备开始终止实例"
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr "��实例 %r"
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr "准备�止实例"
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr "准备�动实例"
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr "解除镜� %s 的注册"
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "用id %(image_id)s 注册镜� %(image_location)s"
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr "用户或者组没有确定"
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr "仅仅支�组\"all\""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr "operation_type必须添加或者移除"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "正在更新镜� %s 的 publicity 属性"
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "无法在 %d 秒内�止实例"
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 #, fuzzy
 msgid "Expecting a list of resources"
 msgstr "获�实例列表"
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "实例 - %s �存在"
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 #, fuzzy
 msgid "Expecting a list of tagSets"
 msgstr "获�实例列表"
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "无效的"
@@ -2048,12 +1979,12 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 #, fuzzy
 msgid "Invalid proxy request signature."
 msgstr "无效的请求：%s"
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, fuzzy, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr "为ip： %s获�元数�失败"
@@ -2072,19 +2003,19 @@ msgstr "%(url)s �HTTP %(status)d返回"
 msgid "Must specify an ExtensionManager class"
 msgstr "必须明确一个ExtensionManager类"
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr "扩展资�：%s"
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr "扩展%(ext_name)s：无法扩展资� %(collection)s：没有那�资�"
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr "扩展资�的扩展 %(ext_name)s：%(collection)s"
@@ -2096,64 +2027,64 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr "limit �数必须是整数"
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr "limit�数必须是正数"
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr "offset �数必须是整数"
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr "offset �数必须是正数"
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr "没有找到标记 [%s]"
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr "href %s �包�版本"
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr "超过镜�元数��制"
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 #, fuzzy
 msgid "Invalid image metadata"
 msgstr "无效的元数�"
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr "'%(action)s' 针对处于 %(attr)s %(state)s 的实例是无法进行"
 
-#: nova/api/openstack/common.py:364
-#, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+#: nova/api/openstack/common.py:366
+#, fuzzy, python-format
+msgid "Instance is in an invalid state for '%s'"
 msgstr "实例针对 '%(action)s' 处于无效状�"
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr "拒�快照请求，快照当�未被激活"
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr "该时刻实例快照是��许的。"
 
@@ -2207,14 +2138,14 @@ msgstr "调用扩展工厂 %s"
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "加载扩展 %(ext_factory)s 失败：%(exc)s"
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "加载扩展 %(classpath)s 失败：%(exc)s"
 
 #: nova/api/openstack/extensions.py:370
-#, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+#, fuzzy, python-format
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr "加载扩展 %(ext_name)s 失败：%(exc)s"
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2257,13 +2188,13 @@ msgstr "请求中没有�供主体"
 msgid "There is no such action: %s"
 msgstr "没有该动作：%s"
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr "错误格�的请求主体"
 
@@ -2272,20 +2203,20 @@ msgstr "错误格�的请求主体"
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, fuzzy, python-format
 msgid "Calling method %s"
 msgstr "调用 getter %s"
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr "�支�的Content-Type"
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr "错误格�的请求url"
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2298,12 +2229,12 @@ msgstr "元素�是�节点"
 msgid "root element selecting a list"
 msgstr "根元素选择列表"
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr "模�数�匹�；把slave %(slavetag)s 添加到master %(mastertag)s"
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr "subclasses必须执行construct()!"
 
@@ -2311,17 +2242,17 @@ msgstr "subclasses必须执行construct()!"
 msgid "Initializing extension manager."
 msgstr "正在�始化扩展管�员。"
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, fuzzy, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr "用户 %s 的签�无效"
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, fuzzy, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr "用户 %s 的签�无效"
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2386,220 +2317,220 @@ msgstr "�务器�存在"
 msgid "Metadata item was not found"
 msgstr "元数�项目未找到"
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr "无效的changes-since值"
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 #, fuzzy
 msgid "Only administrators may list deleted instances"
 msgstr "准备�试软删除实例 %s"
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, fuzzy, python-format
 msgid "Flavor '%s' could not be found "
 msgstr "主机 %(host)s 没有找到。"
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr "无法找到实例"
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr "错误的个性化格�：丢失 %s"
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr "��的个性化格�"
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr "个性化 %s 的内容无法解�"
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 #, fuzzy
 msgid "Unknown argment : port"
 msgstr "未知的guestmount错误"
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, fuzzy, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr "��的网络格�：网络 uuid 格��正确 (%s)"
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr "��的网络格�：网络 uuid 格��正确 (%s)"
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr "�正确的固定 IP 地�(%s)"
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr "��许��的网络(%s)"
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr "错误的网络格�：丢失%s"
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr "错误的网络格�"
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr "Userdata 内容无法解�"
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr "accessIPv4 �是正确的IPv4格�"
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 #, fuzzy
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr "accessIPv4 �是正确的IPv4格�"
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr "�务器�称未定义"
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr "�供了无效的flavorRef。"
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 #, fuzzy
 msgid "min_count must be an integer value"
 msgstr "limit �数必须是整数"
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 #, fuzzy
 msgid "max_count must be an integer value"
 msgstr "limit �数必须是整数"
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr "无法找到请求的镜�"
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr "�供了无效的key_name。"
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "id�能是None"
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "id�能是None"
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr "实例还没有调整大�。"
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 #, fuzzy
 msgid "Flavor used by the instance could not be found."
 msgstr "实例 %(instance_id)s 没有找到。"
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr "��的�数'type'既�是HARD也�是SOFT"
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr "缺少��的�数'type'"
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr "无法找到请求的类型。"
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 #, fuzzy
 msgid "Resize requires a flavor change."
 msgstr "调整大�需�尺寸的改�。"
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr "缺少属性imageRef"
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr "�供了无效的imageRef。"
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr "缺少属性flavorRef"
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr "没有确定adminPass"
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr "无效的adminPass"
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "�新�动实例失败"
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr "无法解�元数�键/值对"
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "调整大�请求中的属性'flavorRef'无效。"
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "调整大�请求�求有属性'flavorRef'。"
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr "无效的请求主体"
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr "无法解�请求中的imageRef。"
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr "无法找到用��新创建的镜�"
 
@@ -2607,9 +2538,9 @@ msgstr "无法找到用��新创建的镜�"
 msgid "createImage entity requires name attribute"
 msgstr "实体createImage需�属性name"
 
-#: nova/api/openstack/compute/servers.py:1409
-#, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+#: nova/api/openstack/compute/servers.py:1408
+#, fuzzy, python-format
+msgid "Removing options '%s' from query"
 msgstr "正在从查询语�中移除选项 '%(unk_opt_str)s'"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2697,7 +2628,7 @@ msgstr "host与block_migration必须确定"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, fuzzy, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr "实例 %(id)s 到主机 %(host)s 的动��移失败"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2716,19 +2647,19 @@ msgid "Compute.api::resetState %s"
 msgstr "compute.api::resume %s"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
-#, python-format
-msgid "Cannot show aggregate: %(id)s"
-msgstr ""
+#, fuzzy, python-format
+msgid "Cannot show aggregate: %s"
+msgstr "更新代�失败：%(resp)r"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, fuzzy, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr "更新代�失败：%(resp)r"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
-#, python-format
-msgid "Cannot delete aggregate: %(id)s"
-msgstr ""
+#, fuzzy, python-format
+msgid "Cannot delete aggregate: %s"
+msgstr "更新代�失败：%(resp)r"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
 #, python-format
@@ -2889,16 +2820,16 @@ msgstr "网络�包�动作 %s"
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr "%s 必须是'MANUAL' 或者 'AUTO'。"
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 #, fuzzy
 msgid "host and onSharedStorage must be specified."
 msgstr "host与block_migration必须确定"
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, fuzzy, python-format
 msgid "Error in evacuate, %s"
 msgstr "�移错误 %s"
@@ -3014,7 +2945,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "浮动ip %(address)s 没有被关�。"
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3048,29 +2979,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr "把主机 %(host)s 设置为 %(state)s。"
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "调用 getter %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "正在更新主机状�"
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr "Describe-resource是�有管�员�能执行的功能。"
 
@@ -3301,33 +3232,33 @@ msgstr "vol=%s"
 msgid "Delete volume with id: %s"
 msgstr "删除id为 %s 的�"
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, fuzzy, python-format
 msgid "Instance %s is not attached."
 msgstr "实例 %s：没有�动"
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, fuzzy, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr "��的网络格�：网络 uuid 格��正确 (%s)"
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr "把� %(volume_id)s 附加到实例 %(server_id)s 的 %(device)s 设备上"
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr "删除id为 %s 的快照"
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr "为� %s 创建快照"
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3346,94 +3277,94 @@ msgstr "释放地� %s"
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, fuzzy, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr "没有适用于消�的方法：%s"
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, fuzzy, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr "加载扩展 %(ext_factory)s 失败：%(exc)s"
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, fuzzy, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr "没有适用于消�的方法：%s"
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, fuzzy, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr "正在删除基文件：%s"
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, fuzzy, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr "把“%(method)s�投放在主机 \"%(host)s\""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, fuzzy, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
-msgstr "没有为实例 %(instance_id)s 找到�移其状�为 %(status)s 。"
+msgid "Got update for instance: %(instance)s"
+msgstr "没有为实例 %(instance_id)s 找到�。"
 
-#: nova/cells/messaging.py:838
+#: nova/cells/messaging.py:862
 #, fuzzy, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+msgid "Got update to delete instance"
 msgstr "没有为实例 %(instance_id)s 找到�。"
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3450,7 +3381,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "没有为实例 %(instance_id)s 找到�。"
@@ -3464,7 +3395,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3491,7 +3422,7 @@ msgstr "�网掩�已存入openvpn�置"
 msgid "Launching VPN for %s"
 msgstr "�动VPN %s"
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, fuzzy, python-format
 msgid "Failed to load %s"
 msgstr "无法创建�"
@@ -3511,282 +3442,282 @@ msgstr "元素�是�节点"
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 #, fuzzy
 msgid "leasing ip"
 msgstr "正在创建镜�"
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 #, fuzzy
 msgid "releasing ip"
 msgstr "正在创建镜�"
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 #, fuzzy
 msgid "Reserved"
 msgstr "已接收 %s"
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "数�库错误：%s"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 #, fuzzy
 msgid "network"
 msgstr "�置网络"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 #, fuzzy
 msgid "IP address"
 msgstr "起始地�"
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 #, fuzzy
 msgid "No fixed IP found."
 msgstr "找�到固定IP。"
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, fuzzy, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr "没有固定ip与实例关�"
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "浮动ip %(address)s 已被关�。"
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr "id"
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr "IPv4"
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr "IPv6"
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "起始地�"
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr "DNS1"
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr "DNS2"
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr "VlanID"
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr "项目"
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr "uuid"
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 #, fuzzy
 msgid "No networks found"
 msgstr "没有找到网络"
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "创建网络 %(req)s  是必�的。"
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 #, fuzzy
 msgid "instance"
 msgstr "�止实例 %r"
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "�务 %(service_id)s 没有找到。"
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "�务 %(service_id)s 没有找到。"
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "�外错误：%s"
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 #, fuzzy
 msgid "PROJECT"
 msgstr "项目"
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3870,254 +3801,254 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr "超过实例的��。您无法�行更多此类型的实例。"
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "超过实例的��。您�能��行 %s 个此类型的实例。"
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, fuzzy, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr "%(pid)s 已�超过��，试图�行 %(min_count)s 个实例"
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr "%(pid)s 已�超过��，试图设置 %(num_metadata)s 个元数�属性"
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 #, fuzzy
 msgid "Metadata property key greater than 255 characters"
 msgstr "安全组 %s �能比255个字符更长。"
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 #, fuzzy
 msgid "Metadata property value greater than 255 characters"
 msgstr "安全组 %s �能比255个字符更长。"
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "无法附加�到实例 %s"
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "准备�行 %s 个实例"
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "准备开始终止实例"
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "实例类型 %(instance_type_id)s 没有找到。"
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "准备开始终止实例"
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, fuzzy, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr "没有托管实例 %s，立刻删除"
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "准备�试软删除实例 %s"
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "准备�试终止实例 %s"
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "准备�试�止实例 %s"
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "准备�试�动实例 %s"
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr "�索�件： %s"
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "开始为虚拟机 %s 快照"
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id为空。�定在�移。"
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr "旧的实例类型 %(current_instance_type_name)s，新的实例类型 %(new_instance_type_name)s"
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, fuzzy, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr "%(pid)s 已�超过��，试图�行 %(min_count)s 个实例"
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "准备�试终止实例 %s"
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr "密钥对�称长度必须在1到255个字符之间"
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr "安全组 %s 既�是字符串也�是unicode"
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "安全组 %s �能为空。"
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, fuzzy, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr "�数GroupName的值 (%s) 无效。长度超过了上�255。"
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr "安全组 %s �能比255个字符更长。"
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr "创建安全组 %s"
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr "安全组 %s 已�存在"
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "无法销�VBD %s"
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "安全组id应该是整数"
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "没有找到规则 (%s)"
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "添加安全组规则：%r"
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "授� %s 安全组入���"
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "撤销 %s 安全组入���"
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr "安全组id应该是整数"
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, fuzzy, python-format
 msgid "Aborting claim: %s"
 msgstr "实例的network_info：|%s|"
@@ -4152,220 +4083,220 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
+#, python-format
+msgid "'%s' argument must be greater than 0"
+msgstr ""
+
+#: nova/compute/flavors.py:108
 #, fuzzy, python-format
-msgid "'%s' argument must be a positive integer"
-msgstr "创建�数必须是正整数"
+msgid "'%s' argument must be greater than or equal to 0"
+msgstr "createBackup的属性 'rotation'必须是整数"
 
-#: nova/compute/flavors.py:113
+#: nova/compute/flavors.py:117
 #, fuzzy
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr "创建�数必须是正整数"
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
-msgstr ""
-
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr "数�库错误：%s"
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr "未找到�删除的实例类型 %s"
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr "无法把实例 (%(instance_id)s) �移到当�主机 (%(host)s)。"
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "�新�动实例失败"
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr "当�状�是 %(drv_state)s，数�库状�是 %(db_state)s。"
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr "nova-compute���，实例正在��。"
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 #, fuzzy
 msgid "Hypervisor driver does not support resume guests"
 msgstr "虚拟机管�程�驱动�支�防�墙规则"
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "挂起实例失败"
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "虚拟机管�程�驱动�支�防�墙规则"
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "�外的状��"
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr "正在检查状�"
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "正在设置 bdm %s"
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "释放实例的网络"
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "实例生产失败"
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "数�库错误：%s"
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
@@ -4374,7 +4305,7 @@ msgstr ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
@@ -4383,170 +4314,170 @@ msgstr ""
 "镜� '%(image_id)s'  的大�为 %(size_bytes)d ，超过实例类型 instance_type 所�许的大� "
 "%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr "正在�动虚拟机"
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr "实例网络设置失败"
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "实例的network_info：|%s|"
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr "实例�设备设置失败"
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr "实例生产失败"
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr "释放实例的网络"
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s 实例"
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "释放实例的网络"
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "忽略异常 DiskNotFound: %s"
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, fuzzy, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "忽略异常 DiskNotFound: %s"
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr "终止bdm %s"
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s。把实例的 vm_state设置为ERROR"
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "正在�新创建实例 %s"
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, fuzzy, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr "%(path)s 在共享存储上：%(reason)s"
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "为� %s 创建快照"
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "正在��虚拟机 %s"
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, fuzzy, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr "试图��一个没有�行的实例：%(instance_uuid)s (状�：%(state)s 预计：%(running)s)"
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "无法�新创建实例 [%(instance_uuid)s]: %(exc)s"
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "实例 %s：��"
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "实例 %s: 快照中"
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, fuzzy, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr "试图为一个没有�行的实例快照：%(instance_uuid)s (状�：%(state)s 预计：%(running)s)"
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "找到 %(num_images)d 个镜� (rotation: %(rotation)d)"
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "轮�出%d个备份"
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr "正在删除镜� %s"
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "设置管�员密�失败。实例 %s 没有�行"
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 #, fuzzy
 msgid "Root password set"
 msgstr "实例 %s：Root密�已设置"
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 #, fuzzy
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr "该驱动�能执行set_admin_password。"
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, fuzzy, python-format
 msgid "set_admin_password failed: %s"
 msgstr "该驱动�能执行set_admin_password。"
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 #, fuzzy
 msgid "error setting admin password"
 msgstr "设置管�员密�出错"
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, fuzzy, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
@@ -4555,179 +4486,179 @@ msgstr ""
 "试图把一个文件注入到没有�行的实例：%(instance_uuid)s (状�: %(current_power_state)s 预计: "
 "%(expected_state)s)"
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, fuzzy, python-format
 msgid "injecting file to %(path)s"
 msgstr "注入文件路径：'%s'"
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "挂起实例失败"
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "数�库错误：%s"
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 #, fuzzy
 msgid "Unrescuing"
 msgstr "实例 %s：�消救�"
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "实例没有�。"
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr "目标与��一样。"
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 #, fuzzy
 msgid "Pausing"
 msgstr "正在更新。"
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "实例 %s ：获�诊断"
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 #, fuzzy
 msgid "Reset network"
 msgstr "�置网络"
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 #, fuzzy
 msgid "Inject network info"
 msgstr "实例 %s：注入网络信�"
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "将注入的network_info：|%s|"
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 #, fuzzy
 msgid "Get console output"
 msgstr "获�实例 %s 控制�输出"
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "实例 %s：正在获得VNC控制�"
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 #, fuzzy
 msgid "Getting spice console"
 msgstr "实例 %s：正在获得VNC控制�"
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr "� %(volume_id)s 正在 %(mountpoint)s 上�动"
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr "正在把� %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, fuzzy, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr "� %(volume_id)s 正在 %(mountpoint)s 上�动"
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "正在把� %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr "� %(volume_id)s 从挂载点 %(mp)s 分离"
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "从未知实例%s中分离�"
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "正在把� %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, fuzzy, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr "实例 %s 的网络分�"
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, fuzzy, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr "网络 %(network_id)s 没有找到。"
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, fuzzy, python-format
 msgid "Host %(host)s not found"
 msgstr "主机 %(host)s 没有找到。"
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr "预在线�移在%(dest)s失败"
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 #, fuzzy
 msgid "_post_live_migration() is started.."
 msgstr "post_live_migration()已��动。"
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr "把实例�移到 %(dest)s �功完�。"
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -4735,170 +4666,175 @@ msgstr ""
 "你会看到错误“libvirt: QEMU error: Domain not found: no domain with matching "
 "name。�这个错误�以放心的忽略。"
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 #, fuzzy
 msgid "Post operation of migration started"
 msgstr "�移��作�动"
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "为ip： %s获�元数�失败"
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr "�现 %(migration_count)d 个超过 %(confirm_window)d 秒未�确认的�移"
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, fuzzy, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr "为实例 %(instance_uuid)s 关闭虚拟机"
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "没有找到实例 %(instance_id)s"
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 #, fuzzy
 msgid "In ERROR state"
 msgstr "节点处于未知的错误状�。"
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr "更新带宽使用缓存"
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "更新带宽使用缓存"
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr "更新主机状�"
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr "在数�库中找到 %(num_db_instances)s个实例，在虚拟机管�程�找到 %(num_vm_instances)s 个实例。"
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "实例未�动"
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 #, fuzzy
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0，跳过..."
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr "回收删除的实例"
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, fuzzy, python-format
 msgid "No service record for host %s"
 msgstr "计算节点 %s 没有�务"
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, fuzzy, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr "检测标签�为 '%(name_label)s' 的实例，这些实例被标识为DELETED��然存在于主机上。"
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, fuzzy, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr "销�标签�为 '%(name_label)s' 的实例，这些实例被标识为DELETED��然存在于主机上。"
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, fuzzy, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr "无法识别的FLAGS.running_deleted_instance_action的�值 '%(action)s'"
 
+#: nova/compute/manager.py:4129
+#, fuzzy, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr "设置实例 %(instance_uuid)s 至 ERROR 状�"
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -5010,7 +4946,7 @@ msgstr "无法找到实例 %s 的宿主机"
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5021,7 +4957,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 #, fuzzy
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr "block_device_mapping %s"
@@ -5102,56 +5038,52 @@ msgstr "检查令牌：%(token)s, %(token_valid)s)"
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 #, fuzzy
 msgid "Failed to notify cells of instance update"
 msgstr "�新�动实例失败"
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 #, fuzzy
 msgid "Failed to notify cells of instance fault"
 msgstr "�新�动实例失败"
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "无法识别的 read_deleted �值�%s“"
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "实例 %s：已救�"
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5168,51 +5100,51 @@ msgstr "version应该是整数"
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5298,16 +5230,20 @@ msgstr "错误的to_global_ipv6�缀：%s"
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr "错误的to_global_ipv6 oject_id；%s"
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 #, fuzzy
 msgid "Failed storing info cache"
 msgstr "�新�动实例失败"
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, fuzzy, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr "把地� %(public_ip)s 关�到实例 %(instance_id)s"
@@ -5422,103 +5358,103 @@ msgstr "驱动仅支�入�类型 'a'。"
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr "试图移除�存在的链 %s。"
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr "未知链：%r"
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr "试图移除�存在的规则：%(chain)r %(rule)r %(wrap)r %(top)r"
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr "IPTablesManager.apply�功完�"
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, fuzzy, python-format
 msgid "arping error for ip %s"
 msgstr "在 %s 中�生 httplib 错误： "
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, fuzzy, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr "Pid %d 过期了，�新�动dnsmasq"
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "挂起进程 dnsmasq 时抛出 %s"
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d 过期了，�新�动dnsmasq"
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "�掉进程 radvd 时抛出 %s"
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d 过期了，�新�动radvd"
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "无效的状�：'%s'"
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "正在开�VLAN接� %s"
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "��桥 %s"
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "��vlan %(vlan)s 和桥 %(bridge)s"
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "挂起实例失败"
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "��桥 %s"
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "��桥 %s"
@@ -5618,38 +5554,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr "cidr 已�在使用"
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr "请求的cidr (%(cidr)s) 与已存在的超网络 (%(super)s) 冲�"
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr "请求的cidr (%(cidr)s) 与已存在的较�的cidr (%(smaller)s) 冲�"
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr "网络已�存在。"
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "网路在删除�必须与项目 %s 解除关�"
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "网络数�与VLAN起始数之和�能大于4049"
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, fuzzy, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5685,7 +5621,7 @@ msgstr "_delete: %s"
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr "�留的网络信� nw_info �求使用 IPv4 �网"
 
@@ -5768,68 +5704,68 @@ msgstr "找�到适�id %(id)s 的浮动IP。"
 msgid "Quantum Error creating security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "删除安全组 %s"
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "抓到错误：%s"
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "删除安全组 %s"
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "安全组id应该是整数"
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "抓到错误：%s"
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "带有规则 %(rule_id)s 的安全组没有找到。"
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, fuzzy, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr "没有找到安全组 %(security_group_id)s 针对项目 %(project_id)s 。"
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5846,27 +5782,27 @@ msgstr "这�规则已�存在于组%s 中"
 msgid "Original exception being dropped: %s"
 msgstr "外键约�无法删除"
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, fuzzy, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "获得信�� \"%(lock)s\" 为方法 \"%(method)s\" ...�"
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, fuzzy, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "正在 试图获�� \"%(lock)s\" 为方法 \"%(method)s\"...�"
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, fuzzy, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr "获得文件� \"%(lock)s\" 为方法 \"%(method)s\"...�"
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, fuzzy, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr "获得文件� \"%(lock)s\" 为方法 \"%(method)s\"...�"
@@ -5876,17 +5812,17 @@ msgstr "获得文件� \"%(lock)s\" 为方法 \"%(method)s\"...�"
 msgid "Deprecated: %s"
 msgstr "�外错误：%s"
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr "syslog设备必须作为一个 %s 。"
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, fuzzy, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr "类 %(fullname)s 是�推�的：%(msg)s"
@@ -5961,11 +5897,92 @@ msgstr "�现未知的 utils.execute 关键字�数：%r"
 msgid "Running cmd (subprocess): %s"
 msgstr "正在�行cmd (subprocess)：%s"
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr "�行结果为 %s"
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r 失败，�试。"
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr "�行cmd (SSH)：%s"
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr "SSH上�支�环境��"
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr "SSH上�支�的进程输入�数。"
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+#, fuzzy
+msgid "Full set of CONF:"
+msgstr "标记全集："
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, fuzzy, python-format
+msgid "Caught %s, exiting"
+msgstr "快照 %s：正在删除"
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, fuzzy, python-format
+msgid "Starting %d workers"
+msgstr "起始地�"
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr "数�库异常被包裹。"
@@ -6104,12 +6121,12 @@ msgstr "�异步fanout cast"
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 #, fuzzy
 msgid "An unknown RPC related exception occurred."
 msgstr "�生未知异常。"
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
@@ -6118,46 +6135,51 @@ msgstr ""
 "远程错误：%(exc_type)s %(value)s\n"
 "%(traceback)s。"
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr "无效的RPC连接�用。"
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, fuzzy, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr "删除 %(base_file)s 失败，错误是 %(error)s"
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "返回 %s 异常给调用者"
@@ -6481,7 +6503,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6489,37 +6511,49 @@ msgid ""
 msgstr "无法�移 %(instance_id)s 到 %(dest)s 上：缺少内存(主机：%(avail)s <= 实例：%(mem_inst)s)"
 
 #: nova/scheduler/filter_scheduler.py:73
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+#, fuzzy, python-format
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr "�试创建 %(num_instances)d 个实例"
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, fuzzy, python-format
+msgid "Request Spec: %s"
+msgstr "请求：%s"
+
+#: nova/scheduler/filter_scheduler.py:97
+#, fuzzy, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr "没有为实例 %(instance_id)s 找到�。"
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "过滤掉的主机 %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:357
-#, python-format
-msgid "Choosing host %(chosen_host)s"
-msgstr ""
+#: nova/scheduler/filter_scheduler.py:361
+#, fuzzy, python-format
+msgid "Weighed %(hosts)s"
+msgstr "过滤掉的主机 %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr "无法�移 %(instance_id)s 到 %(dest)s 上：缺少内存(主机：%(avail)s <= 实例：%(mem_inst)s)"
@@ -6714,47 +6748,47 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr "与模型�务器(model server)的连接已���"
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr "失去与模型�务器的连接"
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 #, fuzzy
 msgid "memcached_servers not defined"
 msgstr "�务器�称未定义"
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6807,58 +6841,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr "试图实例化�例"
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr "伪执行命令（�进程）：%s"
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr "伪命令匹� %s"
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr "伪命令引起异常 %s"
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr "伪命令的标准输出stdout='%(stdout)s' 标准错误输出 stderr='%(stderr)s'"
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr "状�必须�用"
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr "已�附加"
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr "已�分离"
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr "请扩展模拟的 libvirt 模��支�标记"
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 #, fuzzy
 msgid "fake vswitch not found"
@@ -6895,18 +6913,18 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 #, fuzzy
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr "%(pid)s 已�超过��，试图�行 %(min_count)s 个实例"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6915,7 +6933,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr "正在�行的实例：%s"
@@ -6932,16 +6950,16 @@ msgstr "终止实例之�：%s"
 msgid "Internal error"
 msgstr "内部错误"
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "强制�死实例�：%s"
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 #, fuzzy
 msgid "spawn error"
 msgstr "未知的guestmount错误"
@@ -7041,6 +7059,22 @@ msgstr "�外的状��"
 msgid "Decoding JSON: %s"
 msgstr "解�JSON：%s"
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr "请扩展模拟的 libvirt 模��支�标记"
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -7065,11 +7099,11 @@ msgid "Loading compute driver '%s'"
 msgstr "LoggingVolumeDriver: %s"
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+#, fuzzy
+msgid "Unable to load the virtualization driver"
 msgstr "无法加载虚拟驱动：%s"
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -7193,19 +7227,19 @@ msgstr "vmwareapi �支�暂�"
 msgid "ipmitool stdout: '%(out)s', stderr: '%(err)s'"
 msgstr "伪命令的标准输出stdout='%(stdout)s' 标准错误输出 stderr='%(stderr)s'"
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7376,15 +7410,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7443,97 +7477,97 @@ msgstr "未找到分区"
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr "镜�已�挂载"
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, fuzzy, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr "忽略�镜� %(img_id)s  注入的数�的错误 (%(e)s)"
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, fuzzy, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr "挂载文件系统失败：%s"
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, fuzzy, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr "挂载文件系统失败：%s"
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, fuzzy, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr "忽略�镜� %(img_id)s  注入的数�的错误 (%(e)s)"
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7872,7 +7906,7 @@ msgstr "实例代�版本：%s"
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr "正在更新主机状�"
@@ -7887,24 +7921,24 @@ msgstr "获�实例 %s 控制�输出"
 msgid "Host IP address is: %s"
 msgstr "释放地� %s"
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8238,12 +8272,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "为实例 |%s| 分�浮动IP"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "注入文件路径：'%s'"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "注入文件路径：'%s'"
@@ -8409,7 +8443,7 @@ msgstr "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "正在创建虚拟机实例快照 %s "
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr "无法确定iscsi initiator�字"
 
@@ -8477,213 +8511,213 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr "正在连接 libvirt：%s"
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr "销�时�生错误。Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 #, fuzzy
 msgid "During wait destroy, instance disappeared."
 msgstr "%s 在�行中消失了。"
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr "实例销��功。"
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "准备�止实例"
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr "在 undefine 时 libvirt �生错误。Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, fuzzy, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr "在 undefine 时 libvirt �生错误。Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr "删除实例文件 %(target)s"
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, fuzzy, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr "schedule_%(method)s 失败：%(ex)s"
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 #, fuzzy
 msgid "Could not determine fibre channel world wide node names"
 msgstr "无法确定iscsi initiator�字"
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 #, fuzzy
 msgid "Could not determine fibre channel world wide port names"
 msgstr "无法确定iscsi initiator�字"
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 #, fuzzy
 msgid "During detach_volume, instance disappeared."
 msgstr "%s 在�行中消失了。"
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "没有网络定义。"
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 #, fuzzy
 msgid "During detach_interface, instance disappeared."
 msgstr "%s 在�行中消失了。"
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "没有网络定义。"
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "实例�功��。"
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "�新�动实例失败"
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 #, fuzzy
 msgid "Instance shutdown successfully."
 msgstr "实例�功生产。"
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr "实例�功��。"
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr "实例在�行"
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr "实例�功生产。"
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data：%(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "用户没有管�员��"
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr "正在创建镜�"
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "将 %(injection)s 注入到镜� %(img_id)s"
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, fuzzy, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr "忽略�镜� %(img_id)s  注入的数�的错误 (%(e)s)"
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8691,74 +8725,74 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr "查找 %(instance_name)s时libvirt出错：[错误代� %(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 #, fuzzy
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr "无法得到CPU的数目，因为这个函数�是给这个平�执行的。这个错误�以被放心忽略。"
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "libvirt版本过旧(�支�getVersion)"
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "正在获�镜� %s 的大�"
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8766,37 +8800,37 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr "创建tmpfile %s �通知其他的计算节点需�挂载相�的存储。"
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr "�存储�移无法在共享存储使用"
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 #, fuzzy
 msgid "Live migration can not be used without shared storage."
 msgstr "�存储�移无法在共享存储使用"
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
@@ -8805,7 +8839,7 @@ msgstr ""
 "无法�移%(instance_id)s 到 %(dest)s 上：缺少�盘(主机:%(available)s <= "
 "实例:%(necessary)s)"
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -8814,7 +8848,7 @@ msgstr ""
 "已�动实例的CPU信�：\n"
 "%s"
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8829,71 +8863,71 @@ msgstr ""
 "\n"
 "�考 %(u)s"
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr "创建tmpfile %s �通知其他的计算节点需�挂载相�的存储。"
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "预在线�移在%(dest)s失败"
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, fuzzy, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr "plug_vifs() 失败%(cnt)d 次。最多�新�试 %(max_retry)d 次在主机 %(hostname)s。"
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, fuzzy, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr "查找 %(instance_name)s时libvirt出错：[错误代� %(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr "因它��，所以跳过 %(path)s"
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 #, fuzzy
 msgid "Starting migrate_disk_and_power_off"
 msgstr "实例 %s：开始执行 migrate_disk_and_power_off"
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 #, fuzzy
 msgid "Instance running successfully."
 msgstr "实例 %s �功�行。"
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 #, fuzzy
 msgid "Starting finish_migration"
 msgstr "实例 %s：开始执行 finish_migration"
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 #, fuzzy
 msgid "Starting finish_revert_migration"
 msgstr "实例 %s：开始执行 finish_revert_migration"
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, fuzzy, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr "删除实例文件 %(target)s"
@@ -8926,95 +8960,95 @@ msgstr "�称为 %(name)s 的nwfilter(%(instance_filter_name)s) 未找到。"
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptables 防�墙：设置基本的过滤规则"
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, fuzzy, python-format
 msgid "Unknown image_type=%s"
 msgstr "未知的�盘镜��柄：%s"
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, fuzzy, python-format
 msgid "Reading image info file: %s"
 msgstr "正在删除基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, fuzzy, python-format
 msgid "Writing stored info to %s"
 msgstr "正在删除基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr "%s 是一个正确的实例�称"
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr "%s 有一个�盘文件"
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr "实例 %(instance)s  由文件 %(backing)s �备份"
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr "实例 %(instance)s 正在使用的备份文件 %(backing)s 没有出现在镜��务里。"
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, fuzzy, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜�验�失败"
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, fuzzy, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜�验�跳过，没有散列存储"
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：正在检查中"
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, fuzzy, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr "删除 %(base_file)s 失败，错误是 %(error)s"
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr "基文件太新�需�删除：%s"
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr "正在删除基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr "删除 %(base_file)s 失败，错误是 %(error)s"
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, fuzzy, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：正在检查中"
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, fuzzy, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
@@ -9023,7 +9057,7 @@ msgstr ""
 "%(container_format)s-%(id)s (%(base_file)s)：正在使用中：本地节点 %(local)d, 远程节点 "
 "%(remote)d"
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, fuzzy, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
@@ -9032,51 +9066,51 @@ msgstr ""
 "%(container_format)s-%(id)s (%(base_file)s)：警告 -- 使用中缺少基文件! 实例： "
 "%(instance_list)s"
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, fuzzy, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜��在使用中"
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, fuzzy, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜�在使用中"
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr "跳过验�，在 %s 上没有基础目录"
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr "验�基础镜�"
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr "未知的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr "活跃的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr "��的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr "�删除的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr "确认完�"
 
@@ -9190,88 +9224,88 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr "在 %s 未找到iSCSI设备"
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, fuzzy, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr "在 %(mount_device)s 上还没有找到iSCSI�。将�次扫�并�试。�试次数：%(tries)s"
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, fuzzy, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr "找到iSCSI节点 %(mount_device)s （�过%(tries)s 次�扫�）"
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, fuzzy, python-format
 msgid "%s is already mounted"
 msgstr "镜�已�挂载"
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, fuzzy, python-format
 msgid "AoE device not found at %s"
 msgstr "在 %s 未找到iSCSI设备"
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, fuzzy, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr "在 %(mount_device)s 上还没有找到iSCSI�。将�次扫�并�试。�试次数：%(tries)s"
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, fuzzy, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr "找到iSCSI节点 %(mount_device)s （�过%(tries)s 次�扫�）"
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 #, fuzzy
 msgid "Fibre Channel device not found."
 msgstr "在 %s 未找到iSCSI设备"
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, fuzzy, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr "在 %(mount_device)s 上还没有找到iSCSI�。将�次扫�并�试。�试次数：%(tries)s"
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, fuzzy, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr "找到iSCSI节点 %(mount_device)s （�过%(tries)s 次�扫�）"
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9345,36 +9379,36 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 #, fuzzy
 msgid "Connection error connecting PowerVM manager"
 msgstr "glance�务器连接错误，�试中"
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, fuzzy, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr "正在�行cmd (subprocess)：%s"
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 #, fuzzy
 msgid "File transfer from PowerVM manager failed"
 msgstr "连接到melange失败"
@@ -9467,74 +9501,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, fuzzy, python-format
 msgid "LPAR instance '%s' not found"
 msgstr "没有找到实例"
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, fuzzy, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr "正在删除基文件：%s"
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, fuzzy, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr "获�实例列表"
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, fuzzy, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr "实例 %s：正在创建镜�"
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, fuzzy, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr "准备�动实例"
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, fuzzy, python-format
 msgid "Instance '%s' failed to boot"
 msgstr "实例 %s：��"
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, fuzzy, python-format
 msgid "Instance spawned in %s seconds"
 msgstr "实例 %s 生产�功"
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, fuzzy, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr "实例 %s: 快照中"
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, fuzzy, python-format
 msgid "Shutting down the instance '%s'"
 msgstr "正�动虚拟机实例 %s"
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, fuzzy, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr "准备�动实例"
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -10030,7 +10064,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr "找到%(instance_count)d个超过%(timeout)d秒悬挂的��"
@@ -10192,19 +10226,19 @@ msgstr "没有在数�库找到�"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "挂载点 %(mountpoint)s 从实例 %(instance_name)s 分离"
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, fuzzy, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr "超时：调用 %(method)s 超时。虚拟机id=%(instance_uuid)s; args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, fuzzy, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr "没有执行：代��支� %(method)s 的调用。虚拟机id=%(instance_uuid)s; args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, fuzzy, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr "对 %(method)s 的调用返回错误：%(e)s。"
@@ -10313,24 +10347,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "解密�钥失败：%s"
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr "�支�在XenServer�动主机"
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr "无法登录到XenAPI(Dom0�盘是空么？)"
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr "得到异常：%s"
@@ -10470,74 +10504,74 @@ msgstr ""
 "网络 %(bridge)s 的 PIF %(pif_rec['uuid'])s  有VLAN id %(pif_vlan)d。期待的数目是 "
 "%(vlan_num)d"
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 #, fuzzy
 msgid "Created VM"
 msgstr "_create: %s"
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 #, fuzzy
 msgid "VM already halted, skipping shutdown..."
 msgstr "虚拟机 %(instance_uuid)s 已�终止，跳过关闭..."
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "没有在实例 %s 找到VBD"
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "已�分离"
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "无法移除 VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "无法销� VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "创建了VBD %(vbd_ref)s 目的是为了虚拟机 %(vm_ref)s，VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "创建了VBD %(vbd_ref)s 目的是为了虚拟机 %(vm_ref)s，VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr "无法销� VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -10546,305 +10580,305 @@ msgstr ""
 "创建了 VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) �置在"
 " %(sr_ref)s。"
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 #, fuzzy
 msgid "SR not present and could not be introduced"
 msgstr "无法找到实例"
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, fuzzy, python-format
 msgid "block device info: %s"
 msgstr "�设备列表 block_device_list %s"
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr "克隆了 VDI %(vdi_ref)s 对象�自VDI %(vdi_to_clone_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, fuzzy, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr "未找到 %(vm_ref)s 的主VDI"
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "开始为虚拟机 %s 快照"
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr "�能在ext类型的缺�本地存储库支�快速克隆。这个系统的存储库类型为 %(sr_type)s。忽略此 cow 标记。"
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, fuzzy, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr "xapi 'download_vhd' 返回“%(vdi_type)s�类型的VDI，其UUID为 “%(vdi_uuid)s�"
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, fuzzy, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr "请求 xapi 获� vhd 镜� %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr "image_size_bytes=%(size_bytes)d，allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr "镜�大� %(size_bytes)d 超过instance_type所�许的�大 %(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "获�镜� %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "镜� %(image)s 的大�：%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr "内核/内存盘镜�太大：%(vdi_size)d 字节，最大 %(max_size)d 字节"
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "将VDI %s �制到dom0的/boot/guest下"
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "内核/内存盘 VDI %s 已销�"
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "实例 %s：获�Glance镜�失败"
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr "检测到 %(image_type_str)s 格�，目标是镜� %(image_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "为PV内核查询vdi %s"
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr "未知的镜�格� %(disk_image_type)s"
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s �然�用"
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "�新扫�存储库 %s"
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr "标记sr_matching_filter '%s' 没有�循格��求"
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr "XenAPI无法找到安装客户实例的存储库。请检查你的�置或者�置标记'sr_matching_filter'"
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr "无法找到content-type ISO的存储库"
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr "ISO：正在查看存储库 %(sr_rec)s"
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr "ISO：�iso内容"
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr "ISO：iso content_type，没有 'i18n-key' 键"
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr "ISO：iso content_type，i18n-key的值�是 'local-storage-iso'"
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr "ISO: 存储库符�标准"
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr "ISO: ISO, 正在查看是�是本地的主机"
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr "ISO: PBD %(pbd_ref)s 消失了"
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr "ISO: PBD匹�, 想� %(pbd_rec)s, 目�有 %(host)s"
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr "ISO：�有本地PBD的存储库"
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr "无法为��务器详细信�的虚拟机 %(vm_uuid)s 获�RRD XML：%(server)s。"
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr "无法获�包��务器详细情况的RRD XML更新：%(server)s。"
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr "�自Xenserver无效的统计数�：%s"
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s 有父 %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr "父标识 %(parent_uuid)s 和原先的父标识 %(original_parent_uuid)s �匹�，正在等待�并..."
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr "VHD coalesce 将�超过(%(max_attempts)d)，放弃中..."
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "等待设备 %s 创建超时"
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "�入VBD %s... "
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "�入VBD %s 完�。"
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr "VBD %(vbd_ref)s 作为 %(orig_dev)s �入"
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr "VBD %(vbd_ref)s �入错误的设备，�新映射为 %(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "正在销�VDI为 %s 的 VBD "
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "已�销�VDI为 %s 的 VBD"
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "对 %s �行pygrub"
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "找到Xen内核 %s"
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "没有找到Xen内核。正在�动HVM。"
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10852,55 +10886,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr "分区："
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d sectors"
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr "将分区表 %(primary_first)d %(primary_last)d 写入到 %(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "完�写入分区表 %s 。"
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr "直接�作接�文件"
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr "挂载文件系统失败(期望的是�Linux实例)：%s"
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, fuzzy, python-format
 msgid "Updating progress to %(progress)d"
 msgstr "将实例 '%(instance_uuid)s' 的进度更新到 %(progress)d"
@@ -10914,209 +10955,219 @@ msgstr "正在删除基文件：%s"
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 #, fuzzy
 msgid "Starting instance"
 msgstr "正在�动虚拟机"
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr "从 dom0 中移除内核/内存盘文件"
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, fuzzy, python-format
 msgid "Block device information present: %s"
 msgstr "block_device_mapping %s"
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "在数�库更新�失败"
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 #, fuzzy
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr "正在自动�置实例 %(instance_uuid)s 的�盘，�试调整分区大�..."
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 #, fuzzy
 msgid "Starting VM"
 msgstr "��xvp"
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr "%(hypervisor)s/%(os)s/%(architecture)s 最新的agent build 是 %(version)s 版本"
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr "没有找到 %(hypervisor)s/%(os)s/%(architecture)s 的代�创建"
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr "实例代�版本：%s"
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr "设置VCPU ��"
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, fuzzy, python-format
 msgid "Could not find VM with name %s"
 msgstr "找�到VDI ref"
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "快照完毕并为虚拟机 %s 上传"
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr "将 vhd 转移到新主机失败"
 
-#: nova/virt/xenapi/vmops.py:813
-#, fuzzy, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
-msgstr "将 VDI %(cow_uuid)s 由 %(old_gb)dGB 调�到  %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+#, fuzzy
+msgid "Unable to terminate instance."
+msgstr "�新�动实例失败"
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "将 VDI %(vdi_uuid)s 由 %(old_gb)dGB 调大到  %(new_gb)dGB"
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 #, fuzzy
 msgid "Resize complete"
 msgstr "调整实例 %s 的大�完毕"
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 #, fuzzy
 msgid "Unable to find root VBD/VDI for VM"
 msgstr "无法为VDI %s 找到VBD"
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 #, fuzzy
 msgid "Destroying VDIs"
 msgstr "��xvp"
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 #, fuzzy
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr "实例 %(instance_uuid)s 使用RAW或者VHD，跳过内核和内存盘的删除"
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr "实例拥有内核或者内存盘，但�是二者�有"
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr "内核/内存盘文件移除了"
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 #, fuzzy
 msgid "Destroying VM"
 msgstr "��xvp"
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr "虚拟机�存在，跳过销�..."
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr "实例已处于救�模�：%s"
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 #, fuzzy
 msgid "VM is not present, skipping soft delete..."
 msgstr "虚拟机�存在，跳过销�..."
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 #, fuzzy
 msgid "Automatically hard rebooting"
 msgstr "自动冷�� %d"
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "为虚拟机注入网络信�到xs：|%s|"
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 #, fuzzy
 msgid "Creating vifs"
 msgstr "正在创建镜�"
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "正在为虚拟机 %(vm_ref)s，网络 %(network_ref)s 创建VIF。"
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "正在为虚拟机 %(vm_ref)s，网络 %(network_ref)s 创建VIF。"
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 #, fuzzy
 msgid "Injecting hostname to xenstore"
 msgstr "为虚拟机注入hostname到xs：|%s|"
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 #, fuzzy
 msgid "No suitable network for migrate"
 msgstr "错误的网络格�"
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 #, fuzzy
 msgid "Migrate Send failed"
 msgstr "创建失败"
@@ -11247,18 +11298,27 @@ msgstr "�外错误：%s"
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr "�动nova-xvpvncproxy节点(版本 %s)"
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 #, fuzzy
 msgid "status must be 'in-use'"
 msgstr "状�必须�用"
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 #, fuzzy
 msgid "status must be 'available'"
 msgstr "状�必须�用"
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr "%(flag)s：标记集� "
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr "没有为实例 %(instance_id)s 找到�移其状�为 %(status)s 。"
+
diff --git a/nova/locale/zh_TW/LC_MESSAGES/nova.po b/nova/locale/zh_TW/LC_MESSAGES/nova.po
index 9caf4c16a..b4b54586f 100644
--- a/nova/locale/zh_TW/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_TW/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-13 19:38+0000\n"
+"POT-Creation-Date: 2013-05-22 19:37+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"
@@ -83,7 +83,7 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr "發生一個未知例外"
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:86
+#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
@@ -167,8 +167,8 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:235 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2765
+#: nova/exception.py:235 nova/api/ec2/cloud.py:462
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2767
 msgid "Keypair data is invalid"
 msgstr "無效的Keypair"
 
@@ -198,7 +198,7 @@ msgstr ""
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/ec2/cloud.py:625
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
@@ -1235,55 +1235,67 @@ msgstr ""
 
 #: nova/exception.py:1157
 #, python-format
+msgid ""
+"unexpected VM state: expecting %(expected)s but the actual state is "
+"%(actual)s"
+msgstr ""
+
+#: nova/exception.py:1162
+#, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1161
+#: nova/exception.py:1166
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1165
+#: nova/exception.py:1170
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1174
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1174
+#: nova/exception.py:1179
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1179
+#: nova/exception.py:1184
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1184
+#: nova/exception.py:1189
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1189
+#: nova/exception.py:1194
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1193
+#: nova/exception.py:1198
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/exception.py:1197
+#: nova/exception.py:1202
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
+#: nova/exception.py:1208
+#, python-format
+msgid "Instance rollback performed due to: %s"
+msgstr ""
+
 #: nova/hooks.py:62
 #, python-format
 msgid "Running %(name)s pre-hook: %(obj)s"
@@ -1294,7 +1306,7 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:166
+#: nova/manager.py:170
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
@@ -1314,205 +1326,125 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/quota.py:966
+#: nova/quota.py:972
 #, python-format
 msgid "Created reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:988
+#: nova/quota.py:994
 #, python-format
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:990
+#: nova/quota.py:996
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1010
+#: nova/quota.py:1016
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1012
+#: nova/quota.py:1018
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:197
-msgid "Full set of CONF:"
-msgstr ""
-
-#: nova/service.py:204
-#, python-format
-msgid "%(flag)s : FLAG SET "
-msgstr ""
-
-#: nova/service.py:214 nova/service.py:312
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: nova/service.py:258
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: nova/service.py:294
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: nova/service.py:317
-msgid "Unhandled exception"
-msgstr ""
-
-#: nova/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: nova/service.py:334
-#, python-format
-msgid "Starting %d workers"
-msgstr ""
-
-#: nova/service.py:348
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: nova/service.py:351
-#, python-format
-msgid "Child %(pid)d exited with status %(code)d"
-msgstr ""
-
-#: nova/service.py:354
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: nova/service.py:374
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: nova/service.py:385
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
-#: nova/service.py:427
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:444 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:464
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:546
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:581
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:679
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:142
+#: nova/utils.py:145
 #, python-format
 msgid "Expected to receive %(exp)s bytes, but actually %(act)s"
 msgstr ""
 
-#: nova/utils.py:187 nova/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: nova/utils.py:189 nova/openstack/common/processutils.py:221
-msgid "Environment not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:193 nova/openstack/common/processutils.py:225
-msgid "process_input not supported over SSH"
-msgstr ""
-
-#: nova/utils.py:212 nova/openstack/common/processutils.py:167
-#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:118
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: nova/utils.py:231
+#: nova/utils.py:173
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:393
+#: nova/utils.py:335
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:396
+#: nova/utils.py:338
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:435
+#: nova/utils.py:377
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:496
+#: nova/utils.py:438
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:625
+#: nova/utils.py:567
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:654
+#: nova/utils.py:596
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:810
+#: nova/utils.py:733
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:876
+#: nova/utils.py:799
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1008 nova/virt/configdrive.py:177
+#: nova/utils.py:931 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1160
+#: nova/utils.py:1083
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1164
+#: nova/utils.py:1087
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1169
+#: nova/utils.py:1092
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1597,130 +1529,125 @@ msgstr ""
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:184
+#: nova/api/ec2/__init__.py:183
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:201
+#: nova/api/ec2/__init__.py:202
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:205
+#: nova/api/ec2/__init__.py:206
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:240 nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:254
+#: nova/api/ec2/__init__.py:255
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:314
+#: nova/api/ec2/__init__.py:315
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:334
+#: nova/api/ec2/__init__.py:335
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:336
+#: nova/api/ec2/__init__.py:337
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:411
+#: nova/api/ec2/__init__.py:413
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:483
+#: nova/api/ec2/__init__.py:487
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:489
+#: nova/api/ec2/__init__.py:493
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:495
+#: nova/api/ec2/__init__.py:499
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:501
+#: nova/api/ec2/__init__.py:505
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:504
-#, python-format
-msgid "EC2APIError raised: %s"
-msgstr ""
-
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:514
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:517
+#: nova/api/ec2/__init__.py:519
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:522
+#: nova/api/ec2/__init__.py:524
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:526
+#: nova/api/ec2/__init__.py:528
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:530
+#: nova/api/ec2/__init__.py:532
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:534
+#: nova/api/ec2/__init__.py:536
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:538
+#: nova/api/ec2/__init__.py:540
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:542
+#: nova/api/ec2/__init__.py:544
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:551
+#: nova/api/ec2/__init__.py:553
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:552
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554 nova/api/metadata/handler.py:136
-#: nova/api/metadata/handler.py:183
+#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: nova/api/ec2/apirequest.py:62
+#: nova/api/ec2/apirequest.py:61
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
@@ -1730,69 +1657,74 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:417
+#: nova/api/ec2/cloud.py:416
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:434
+#: nova/api/ec2/cloud.py:433
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:441 nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:450
+#: nova/api/ec2/cloud.py:449
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:469
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:612 nova/api/ec2/cloud.py:733
+#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:617
+#: nova/api/ec2/cloud.py:616
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:655 nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:623
+#, python-format
+msgid "Invalid IP protocol %s."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:678
+#: nova/api/ec2/cloud.py:676
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:759
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834
+#: nova/api/ec2/cloud.py:832
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:838 nova/api/openstack/compute/contrib/volumes.py:243
+#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:866
+#: nova/api/ec2/cloud.py:863
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:879
+#: nova/api/ec2/cloud.py:876
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
@@ -1801,7 +1733,7 @@ msgstr ""
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:439
+#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
@@ -1811,7 +1743,7 @@ msgid "Detach Volume Failed."
 msgstr ""
 
 #: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1553 nova/api/ec2/cloud.py:1568
+#: nova/api/ec2/cloud.py:1556 nova/api/ec2/cloud.py:1571
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
@@ -1843,137 +1775,137 @@ msgstr ""
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1257
+#: nova/api/ec2/cloud.py:1259
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1265
+#: nova/api/ec2/cloud.py:1267
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1274
+#: nova/api/ec2/cloud.py:1276
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1279
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1282
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1290
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1293
+#: nova/api/ec2/cloud.py:1295
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1298
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1355
+#: nova/api/ec2/cloud.py:1357
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1365
+#: nova/api/ec2/cloud.py:1367
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1374
+#: nova/api/ec2/cloud.py:1376
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1385
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1474
+#: nova/api/ec2/cloud.py:1476
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1492
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1509
+#: nova/api/ec2/cloud.py:1511
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1571
+#: nova/api/ec2/cloud.py:1574
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1573
+#: nova/api/ec2/cloud.py:1576
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1578
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1590
+#: nova/api/ec2/cloud.py:1593
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1619
+#: nova/api/ec2/cloud.py:1621
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1649
+#: nova/api/ec2/cloud.py:1652
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1667
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691 nova/api/ec2/cloud.py:1736
+#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1694 nova/api/ec2/cloud.py:1739
+#: nova/api/ec2/cloud.py:1697 nova/api/ec2/cloud.py:1742
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1701 nova/api/ec2/cloud.py:1746
+#: nova/api/ec2/cloud.py:1704 nova/api/ec2/cloud.py:1749
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1758
+#: nova/api/ec2/cloud.py:1761
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1831
+#: nova/api/ec2/cloud.py:1834
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2014,11 +1946,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:174
+#: nova/api/metadata/handler.py:178
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:181 nova/api/metadata/handler.py:188
+#: nova/api/metadata/handler.py:185 nova/api/metadata/handler.py:192
 #, fuzzy, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
@@ -2037,19 +1969,19 @@ msgstr ""
 msgid "Must specify an ExtensionManager class"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:252
+#: nova/api/openstack/__init__.py:148 nova/api/openstack/__init__.py:254
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:182 nova/api/openstack/__init__.py:292
+#: nova/api/openstack/__init__.py:183 nova/api/openstack/__init__.py:294
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:187 nova/api/openstack/__init__.py:297
+#: nova/api/openstack/__init__.py:188 nova/api/openstack/__init__.py:299
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -2061,63 +1993,63 @@ msgid ""
 "Bad upgrade or db corrupted?"
 msgstr ""
 
-#: nova/api/openstack/common.py:153 nova/api/openstack/common.py:187
+#: nova/api/openstack/common.py:154 nova/api/openstack/common.py:188
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:156 nova/api/openstack/common.py:191
+#: nova/api/openstack/common.py:157 nova/api/openstack/common.py:192
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:181
+#: nova/api/openstack/common.py:182
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:195
+#: nova/api/openstack/common.py:196
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:230 nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/common.py:231 nova/api/openstack/compute/servers.py:556
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:270
+#: nova/api/openstack/common.py:271
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:285
+#: nova/api/openstack/common.py:286
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:293
+#: nova/api/openstack/common.py:294
 msgid "Image metadata key cannot be blank"
 msgstr ""
 
-#: nova/api/openstack/common.py:296
+#: nova/api/openstack/common.py:297
 msgid "Image metadata key too long"
 msgstr ""
 
-#: nova/api/openstack/common.py:299
+#: nova/api/openstack/common.py:300
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:361
+#: nova/api/openstack/common.py:362
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:364
+#: nova/api/openstack/common.py:366
 #, python-format
-msgid "Instance is in an invalid state for '%(action)s'"
+msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:444
+#: nova/api/openstack/common.py:446
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:448
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -2171,14 +2103,14 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:346
+#: nova/api/openstack/extensions.py:347
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
 #: nova/api/openstack/extensions.py:370
 #, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
@@ -2221,13 +2153,13 @@ msgstr ""
 msgid "There is no such action: %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:932
+#: nova/api/openstack/wsgi.py:915 nova/api/openstack/wsgi.py:934
 #: nova/api/openstack/compute/server_metadata.py:58
 #: nova/api/openstack/compute/server_metadata.py:76
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/evacuate.py:46
+#: nova/api/openstack/compute/contrib/evacuate.py:47
 msgid "Malformed request body"
 msgstr ""
 
@@ -2236,20 +2168,20 @@ msgstr ""
 msgid "Action: '%(action)s', body: %(body)s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:920
+#: nova/api/openstack/wsgi.py:922
 #, python-format
 msgid "Calling method %s"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:929
+#: nova/api/openstack/wsgi.py:931
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:941
+#: nova/api/openstack/wsgi.py:943
 msgid "Malformed request url"
 msgstr ""
 
-#: nova/api/openstack/wsgi.py:1172
+#: nova/api/openstack/wsgi.py:1174
 #, python-format
 msgid "Returning %(code)s to user: %(explanation)s"
 msgstr ""
@@ -2262,12 +2194,12 @@ msgstr ""
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:744
+#: nova/api/openstack/xmlutil.py:742
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:863
+#: nova/api/openstack/xmlutil.py:862
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -2275,17 +2207,17 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:111
+#: nova/api/openstack/compute/flavors.py:107
 #, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:130
+#: nova/api/openstack/compute/flavors.py:127
 #, python-format
 msgid "Invalid minRam filter [%s]"
 msgstr ""
 
-#: nova/api/openstack/compute/flavors.py:137
+#: nova/api/openstack/compute/flavors.py:134
 #, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr ""
@@ -2350,210 +2282,210 @@ msgstr ""
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:521
 #: nova/api/openstack/compute/contrib/cells.py:272
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:538
+#: nova/api/openstack/compute/servers.py:540
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:557
+#: nova/api/openstack/compute/servers.py:559
 #, python-format
 msgid "Flavor '%s' could not be found "
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:574
-#: nova/api/openstack/compute/servers.py:741
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1108
-#: nova/api/openstack/compute/servers.py:1281
+#: nova/api/openstack/compute/servers.py:576
+#: nova/api/openstack/compute/servers.py:743
+#: nova/api/openstack/compute/servers.py:1013
+#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1283
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:593
+#: nova/api/openstack/compute/servers.py:595
 msgid "Device name cannot include spaces."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:612
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:615
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:618
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:649
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:650
+#: nova/api/openstack/compute/servers.py:652
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:660
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:670
+#: nova/api/openstack/compute/servers.py:672
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:685
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:689
+#: nova/api/openstack/compute/servers.py:691
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:692
+#: nova/api/openstack/compute/servers.py:694
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:718
+#: nova/api/openstack/compute/servers.py:720
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:723
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:728
+#: nova/api/openstack/compute/servers.py:730
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:757
+#: nova/api/openstack/compute/servers.py:759
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:806
-#: nova/api/openstack/compute/servers.py:922
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:924
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:849
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:850
+#: nova/api/openstack/compute/servers.py:852
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:858
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:859
+#: nova/api/openstack/compute/servers.py:861
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:863
+#: nova/api/openstack/compute/servers.py:865
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:919
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:925
+#: nova/api/openstack/compute/servers.py:927
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:1001
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1005
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1046
+#: nova/api/openstack/compute/servers.py:1031
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1051
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1065
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1069
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1091
+#: nova/api/openstack/compute/servers.py:1093
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1094
+#: nova/api/openstack/compute/servers.py:1096
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1118
+#: nova/api/openstack/compute/servers.py:1120
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1129
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1154
+#: nova/api/openstack/compute/servers.py:1156
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1167
+#: nova/api/openstack/compute/servers.py:1169
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1171
+#: nova/api/openstack/compute/servers.py:1173
 #: nova/api/openstack/compute/servers.py:1382
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1177
+#: nova/api/openstack/compute/servers.py:1179
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1188
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1199
+#: nova/api/openstack/compute/servers.py:1201
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1202
+#: nova/api/openstack/compute/servers.py:1204
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1220
+#: nova/api/openstack/compute/servers.py:1222
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:284
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1226
+#: nova/api/openstack/compute/servers.py:1228
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Cannot find image for rebuild"
 msgstr ""
 
@@ -2561,9 +2493,9 @@ msgstr ""
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1409
+#: nova/api/openstack/compute/servers.py:1408
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
+msgid "Removing options '%s' from query"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
@@ -2650,7 +2582,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:292
 #, python-format
-msgid "Live migration of instance %(id)s to another host failed"
+msgid "Live migration of instance %s to another host failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:295
@@ -2670,17 +2602,17 @@ msgstr "compute.api::繼續 %s"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
-msgid "Cannot show aggregate: %(id)s"
+msgid "Cannot show aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
-msgid "Cannot update aggregate: %(id)s"
+msgid "Cannot update aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
-msgid "Cannot delete aggregate: %(id)s"
+msgid "Cannot delete aggregate: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:140
@@ -2835,15 +2767,15 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:58
+#: nova/api/openstack/compute/contrib/evacuate.py:59
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:66
+#: nova/api/openstack/compute/contrib/evacuate.py:67
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/evacuate.py:77
+#: nova/api/openstack/compute/contrib/evacuate.py:78
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
@@ -2951,7 +2883,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:378
+#: nova/cmd/manage.py:377
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -2984,29 +2916,29 @@ msgstr ""
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:210
+#: nova/api/openstack/compute/contrib/hosts.py:211
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:223
+#: nova/api/openstack/compute/contrib/hosts.py:224
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:225
+#: nova/api/openstack/compute/contrib/hosts.py:226
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:231
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:246
+#: nova/api/openstack/compute/contrib/hosts.py:247
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:332
+#: nova/api/openstack/compute/contrib/hosts.py:333
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3226,33 +3158,33 @@ msgstr ""
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:356
-#: nova/api/openstack/compute/contrib/volumes.py:450
+#: nova/api/openstack/compute/contrib/volumes.py:359
+#: nova/api/openstack/compute/contrib/volumes.py:456
 #, python-format
 msgid "Instance %s is not attached."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:377
+#: nova/api/openstack/compute/contrib/volumes.py:380
 #, python-format
 msgid "Bad volumeId format: volumeId is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:396
+#: nova/api/openstack/compute/contrib/volumes.py:399
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:573
+#: nova/api/openstack/compute/contrib/volumes.py:579
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:616
+#: nova/api/openstack/compute/contrib/volumes.py:619
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:620
+#: nova/api/openstack/compute/contrib/volumes.py:626
 #, python-format
 msgid "Invalid value '%s' for force."
 msgstr ""
@@ -3271,94 +3203,94 @@ msgstr ""
 msgid "Instance has had its instance_type removed from the DB"
 msgstr ""
 
-#: nova/cells/messaging.py:203
+#: nova/cells/messaging.py:204
 #, python-format
 msgid "Error processing message locally: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:357 nova/cells/messaging.py:363
+#: nova/cells/messaging.py:360 nova/cells/messaging.py:368
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr ""
 
-#: nova/cells/messaging.py:373
+#: nova/cells/messaging.py:380
 #, python-format
 msgid "Unknown %(cell_type)s when routing to %(target_cell)s"
 msgstr ""
 
-#: nova/cells/messaging.py:397
+#: nova/cells/messaging.py:404
 #, python-format
 msgid "Error locating next hop for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:424
+#: nova/cells/messaging.py:431
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:503
+#: nova/cells/messaging.py:510
 #, python-format
 msgid "Error locating next hops for message: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:523
+#: nova/cells/messaging.py:530
 #, python-format
 msgid "Error sending message to next hops: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:541
+#: nova/cells/messaging.py:548
 #, python-format
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:652
+#: nova/cells/messaging.py:659
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:675
+#: nova/cells/messaging.py:682
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:684
+#: nova/cells/messaging.py:692
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:819
 #, fuzzy, python-format
-msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+msgid "Got update for instance: %(instance)s"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/cells/messaging.py:838
+#: nova/cells/messaging.py:862
 #, fuzzy, python-format
-msgid "Got update to delete instance %(instance_uuid)s"
+msgid "Got update to delete instance"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/cells/messaging.py:853
+#: nova/cells/messaging.py:877
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:867
+#: nova/cells/messaging.py:891
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:888
+#: nova/cells/messaging.py:912
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1072
+#: nova/cells/messaging.py:1097
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1092
+#: nova/cells/messaging.py:1117
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3375,7 +3307,7 @@ msgid ""
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:139
+#: nova/cells/scheduler.py:140
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3389,7 +3321,7 @@ msgstr ""
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:330
+#: nova/cells/state.py:331
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3415,7 +3347,7 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/cmd/all.py:61 nova/cmd/all.py:67 nova/cmd/all.py:90
+#: nova/cmd/all.py:60 nova/cmd/all.py:66 nova/cmd/all.py:89
 #, fuzzy, python-format
 msgid "Failed to load %s"
 msgstr "找�到Volume %s"
@@ -3435,270 +3367,270 @@ msgstr ""
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:157 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:161 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:163 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:203 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:47
+#: nova/cmd/dhcpbridge.py:46
 msgid "leasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:67
+#: nova/cmd/dhcpbridge.py:66
 msgid "releasing ip"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:122
+#: nova/cmd/dhcpbridge.py:121
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: nova/cmd/dhcpbridge.py:132
+#: nova/cmd/dhcpbridge.py:131
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:203
+#: nova/cmd/manage.py:202
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:238
+#: nova/cmd/manage.py:237
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:243
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:244
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:245
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:247
+#: nova/cmd/manage.py:246
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:287 nova/cmd/manage.py:358 nova/cmd/manage.py:682
-#: nova/cmd/manage.py:695
+#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:294
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:295
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:297
+#: nova/cmd/manage.py:296
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:298 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:310 nova/cmd/manage.py:334
+#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:326
+#: nova/cmd/manage.py:325
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:385
+#: nova/cmd/manage.py:384
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:434
+#: nova/cmd/manage.py:433
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/cmd/manage.py:609
+#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:504 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:511
+#: nova/cmd/manage.py:510
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:530
+#: nova/cmd/manage.py:529
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:535
+#: nova/cmd/manage.py:534
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:538
+#: nova/cmd/manage.py:537
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:600
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:601
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:602
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:603
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:604
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:605
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:606
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:608
+#: nova/cmd/manage.py:607
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:610
+#: nova/cmd/manage.py:609
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:611 nova/cmd/manage.py:816
+#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:656
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:657
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:658
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:659
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:660
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:662
+#: nova/cmd/manage.py:661
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:684
+#: nova/cmd/manage.py:683
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:697
+#: nova/cmd/manage.py:696
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:763
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:765
+#: nova/cmd/manage.py:764
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:768
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:769
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:770
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:771
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:773
+#: nova/cmd/manage.py:772
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:855
+#: nova/cmd/manage.py:854
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
@@ -3778,244 +3710,244 @@ msgstr ""
 msgid "No nova entries in syslog!"
 msgstr ""
 
-#: nova/compute/api.py:281
+#: nova/compute/api.py:282
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:289
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:297
+#: nova/compute/api.py:298
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:317
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:327
+#: nova/compute/api.py:328
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:331
+#: nova/compute/api.py:332
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:335
+#: nova/compute/api.py:336
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:468
+#: nova/compute/api.py:469
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:508
+#: nova/compute/api.py:529
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/api.py:622
+#: nova/compute/api.py:634
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:738
+#: nova/compute/api.py:750
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:765
+#: nova/compute/api.py:777
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1036
+#: nova/compute/api.py:1048
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "建立虛擬介�失敗"
 
-#: nova/compute/api.py:1172
+#: nova/compute/api.py:1184
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1178
+#: nova/compute/api.py:1190
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1188
+#: nova/compute/api.py:1200
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1232
+#: nova/compute/api.py:1243
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1256
+#: nova/compute/api.py:1267
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1306
+#: nova/compute/api.py:1317
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1323
+#: nova/compute/api.py:1334
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1396
+#: nova/compute/api.py:1407
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1633
+#: nova/compute/api.py:1644
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1984
+#: nova/compute/api.py:1988
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1993
+#: nova/compute/api.py:1997
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2035
+#: nova/compute/api.py:2043
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2175
+#: nova/compute/api.py:2179
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2282
+#: nova/compute/api.py:2284
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2290
+#: nova/compute/api.py:2292
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2362
+#: nova/compute/api.py:2364
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2475
+#: nova/compute/api.py:2477
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2494
+#: nova/compute/api.py:2496
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2498
+#: nova/compute/api.py:2500
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2745
+#: nova/compute/api.py:2747
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2749
+#: nova/compute/api.py:2751
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2845
+#: nova/compute/api.py:2847
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2848
+#: nova/compute/api.py:2850
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2856
+#: nova/compute/api.py:2858
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2862
+#: nova/compute/api.py:2864
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2880
+#: nova/compute/api.py:2882
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2883
+#: nova/compute/api.py:2885
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2892
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2954
+#: nova/compute/api.py:2956
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "找�到Volume %s"
 
-#: nova/compute/api.py:2959
+#: nova/compute/api.py:2961
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2967
+#: nova/compute/api.py:2969
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2970
+#: nova/compute/api.py:2972
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3047 nova/compute/api.py:3121
+#: nova/compute/api.py:3049 nova/compute/api.py:3123
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3063
+#: nova/compute/api.py:3065
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3066
+#: nova/compute/api.py:3068
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3075
+#: nova/compute/api.py:3077
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3128
+#: nova/compute/api.py:3130
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/claims.py:91 nova/compute/claims.py:214
+#: nova/compute/claims.py:91 nova/compute/claims.py:219
 #, python-format
 msgid "Aborting claim: %s"
 msgstr ""
@@ -4049,717 +3981,722 @@ msgstr ""
 
 #: nova/compute/claims.py:162
 #, python-format
-msgid "Total %(type_)s: %(total)d %(unit)s, used: %(used)d %(unit)s"
+msgid "Total %(type)s: %(total)d %(unit)s, used: %(used).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:167
+#: nova/compute/claims.py:169
 #, python-format
-msgid "%(type_)s limit not specified, defaulting to unlimited"
+msgid "%(type)s limit not specified, defaulting to unlimited"
 msgstr ""
 
-#: nova/compute/claims.py:174
+#: nova/compute/claims.py:176
 #, python-format
-msgid "%(type_)s limit: %(limit)d %(unit)s, free: %(free)d %(unit)s"
+msgid "%(type)s limit: %(limit).02f %(unit)s, free: %(free).02f %(unit)s"
 msgstr ""
 
-#: nova/compute/claims.py:181
+#: nova/compute/claims.py:184
 #, python-format
 msgid ""
-"Unable to claim resources.  Free %(type_)s %(free)d %(unit)s < requested "
-"%(requested)d %(unit)s"
+"Unable to claim resources.  Free %(type)s %(free).02f %(unit)s < "
+"requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:96
+#: nova/compute/flavors.py:90
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:105
+#: nova/compute/flavors.py:99
 #, python-format
-msgid "'%s' argument must be a positive integer"
+msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:113
-msgid "'rxtx_factor' argument must be a positive float"
+#: nova/compute/flavors.py:108
+#, python-format
+msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:121
-#, python-format
-msgid "'%s' argument must be greater than 0"
+#: nova/compute/flavors.py:117
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:131
+#: nova/compute/flavors.py:130
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:138
+#: nova/compute/flavors.py:135
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:148
+#: nova/compute/flavors.py:145
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:205
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:364
+#: nova/compute/manager.py:363
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:393
+#: nova/compute/manager.py:392
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:408
+#: nova/compute/manager.py:409
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:425
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:446
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:460
+#: nova/compute/manager.py:461
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:482
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:487
+#: nova/compute/manager.py:488
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:531
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:533
+#: nova/compute/manager.py:534
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:544
+#: nova/compute/manager.py:545
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:549
+#: nova/compute/manager.py:550
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:564
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:568
+#: nova/compute/manager.py:569
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:579
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:582
+#: nova/compute/manager.py:583
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:598
+#: nova/compute/manager.py:599
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:610
+#: nova/compute/manager.py:611
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:746
+#: nova/compute/manager.py:747
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:764
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:864
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:886
+#: nova/compute/manager.py:887
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:907 nova/compute/manager.py:2385
+#: nova/compute/manager.py:908 nova/compute/manager.py:2379
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:949
+#: nova/compute/manager.py:950
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:983
+#: nova/compute/manager.py:984
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1001
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1025 nova/compute/manager.py:2439
+#: nova/compute/manager.py:1026 nova/compute/manager.py:2433
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1039
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1044
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1049
+#: nova/compute/manager.py:1050
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1078
+#: nova/compute/manager.py:1079
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1127
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1135
+#: nova/compute/manager.py:1133
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:1145
+#: nova/compute/manager.py:1143
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1171
+#: nova/compute/manager.py:1169
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1174
+#: nova/compute/manager.py:1172
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1185
+#: nova/compute/manager.py:1183
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1204
+#: nova/compute/manager.py:1202
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1255
+#: nova/compute/manager.py:1253
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1326
+#: nova/compute/manager.py:1324
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1342
+#: nova/compute/manager.py:1340
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1363
+#: nova/compute/manager.py:1360
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1363
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1370
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1421
+#: nova/compute/manager.py:1417
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1474 nova/compute/manager.py:2615
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:1470 nova/compute/manager.py:2608
+#: nova/compute/manager.py:4137
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1622
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1639
+#: nova/compute/manager.py:1635
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1643
+#: nova/compute/manager.py:1639
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1647
+#: nova/compute/manager.py:1643
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1726
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1763
+#: nova/compute/manager.py:1758
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "無法�載 Volume %s"
 
-#: nova/compute/manager.py:1781
+#: nova/compute/manager.py:1776
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1806
+#: nova/compute/manager.py:1801
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1822
+#: nova/compute/manager.py:1817
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:1835
+#: nova/compute/manager.py:1830
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1862
+#: nova/compute/manager.py:1857
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1868
+#: nova/compute/manager.py:1863
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1929
+#: nova/compute/manager.py:1924
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1936
+#: nova/compute/manager.py:1931
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1941
+#: nova/compute/manager.py:1936
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1969
+#: nova/compute/manager.py:1964
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1976
+#: nova/compute/manager.py:1971
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1983
+#: nova/compute/manager.py:1978
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1998
+#: nova/compute/manager.py:1993
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2005
+#: nova/compute/manager.py:2000
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2013
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2022
+#: nova/compute/manager.py:2017
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2037
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2055
+#: nova/compute/manager.py:2050
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2074
+#: nova/compute/manager.py:2069
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:2078
+#: nova/compute/manager.py:2073
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2096
+#: nova/compute/manager.py:2091
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2117
+#: nova/compute/manager.py:2112
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2337
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2349
+#: nova/compute/manager.py:2343
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2366
+#: nova/compute/manager.py:2360
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2612
+#: nova/compute/manager.py:2605
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2668
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2693
+#: nova/compute/manager.py:2686
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2731
+#: nova/compute/manager.py:2724
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2762
+#: nova/compute/manager.py:2755
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2782
+#: nova/compute/manager.py:2775
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2780
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2790
+#: nova/compute/manager.py:2783
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2807
+#: nova/compute/manager.py:2800
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2827
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2862
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2916
+#: nova/compute/manager.py:2909
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2967
+#: nova/compute/manager.py:2959
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2976
+#: nova/compute/manager.py:2968
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2991
+#: nova/compute/manager.py:2983
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "�載_Volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3021
+#: nova/compute/manager.py:3013
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3031
+#: nova/compute/manager.py:3023
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:3038
+#: nova/compute/manager.py:3030
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "�載_Volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3062
+#: nova/compute/manager.py:3053
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3100
+#: nova/compute/manager.py:3089
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3120
+#: nova/compute/manager.py:3109
 #, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3134
+#: nova/compute/manager.py:3123
 #, python-format
 msgid "Host %(host)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3278
+#: nova/compute/manager.py:3276
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:3306
+#: nova/compute/manager.py:3304
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3361
+#: nova/compute/manager.py:3359
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3363
+#: nova/compute/manager.py:3361
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3376
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3406
+#: nova/compute/manager.py:3408
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3525
+#: nova/compute/manager.py:3537
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3570
+#: nova/compute/manager.py:3587
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3576
+#: nova/compute/manager.py:3593
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3585
+#: nova/compute/manager.py:3602
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3592
+#: nova/compute/manager.py:3609
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3596
+#: nova/compute/manager.py:3613
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3603
+#: nova/compute/manager.py:3620
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3629
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3646
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3648
+#: nova/compute/manager.py:3665
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3672
+#: nova/compute/manager.py:3689
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3789
+#: nova/compute/manager.py:3806
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3806
+#: nova/compute/manager.py:3823
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3833
+#: nova/compute/manager.py:3850
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3838 nova/compute/manager.py:3888
+#: nova/compute/manager.py:3855 nova/compute/manager.py:3905
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3875
+#: nova/compute/manager.py:3892
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3913
+#: nova/compute/manager.py:3930
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3925 nova/compute/manager.py:3934
-#: nova/compute/manager.py:3964
+#: nova/compute/manager.py:3942 nova/compute/manager.py:3951
+#: nova/compute/manager.py:3981
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3929
+#: nova/compute/manager.py:3946
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3945
+#: nova/compute/manager.py:3962
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3951
+#: nova/compute/manager.py:3968
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3957
+#: nova/compute/manager.py:3974
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3973
+#: nova/compute/manager.py:3990
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:3998
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4001
+#: nova/compute/manager.py:4010
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4028
+#: nova/compute/manager.py:4037
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4038 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4047 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4079
+#: nova/compute/manager.py:4088
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4086
+#: nova/compute/manager.py:4095
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4093
+#: nova/compute/manager.py:4102
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
+#: nova/compute/manager.py:4129
+#, python-format
+msgid "Setting instance back to ACTIVE after: %s"
+msgstr ""
+
 #: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
@@ -4869,7 +4806,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:380
+#: nova/conductor/api.py:373
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -4880,7 +4817,7 @@ msgstr ""
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:262
+#: nova/conductor/manager.py:263
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -4958,54 +4895,50 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:673 nova/db/api.py:694
+#: nova/db/api.py:674 nova/db/api.py:695
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:734
-msgid "Failed to notify cells of instance info cache update"
-msgstr ""
-
-#: nova/db/api.py:1456
+#: nova/db/api.py:1453
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1591
+#: nova/db/api.py:1588
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:157
+#: nova/db/sqlalchemy/api.py:160
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:192
+#: nova/db/sqlalchemy/api.py:195
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:205 nova/virt/baremetal/db/sqlalchemy/api.py:61
+#: nova/db/sqlalchemy/api.py:208 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1408
+#: nova/db/sqlalchemy/api.py:1411
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1546
+#: nova/db/sqlalchemy/api.py:1549
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2836
+#: nova/db/sqlalchemy/api.py:2908
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4344
+#: nova/db/sqlalchemy/api.py:4416
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5022,51 +4955,51 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:53
+#: nova/db/sqlalchemy/utils.py:63
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:59
+#: nova/db/sqlalchemy/utils.py:69
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:161
+#: nova/db/sqlalchemy/utils.py:171
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:195
+#: nova/db/sqlalchemy/utils.py:205
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:201
+#: nova/db/sqlalchemy/utils.py:211
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:210
+#: nova/db/sqlalchemy/utils.py:220
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:231
+#: nova/db/sqlalchemy/utils.py:241
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:234
+#: nova/db/sqlalchemy/utils.py:244
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:255
+#: nova/db/sqlalchemy/utils.py:265
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
@@ -5151,15 +5084,19 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:55
+#: nova/network/api.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:80
+#: nova/network/api.py:90
+msgid "Failed to notify cells of instance info cache update"
+msgstr ""
+
+#: nova/network/api.py:93
 msgid "Failed storing info cache"
 msgstr ""
 
-#: nova/network/api.py:235
+#: nova/network/api.py:248
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -5273,103 +5210,103 @@ msgstr ""
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
-#: nova/network/linux_net.py:220
+#: nova/network/linux_net.py:219
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:255
+#: nova/network/linux_net.py:254
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:280
+#: nova/network/linux_net.py:279
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:425
+#: nova/network/linux_net.py:424
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:681
+#: nova/network/linux_net.py:680
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:731
+#: nova/network/linux_net.py:730
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:776
+#: nova/network/linux_net.py:778
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:975
+#: nova/network/linux_net.py:977
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1020
+#: nova/network/linux_net.py:1022
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1022
+#: nova/network/linux_net.py:1024
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1102
+#: nova/network/linux_net.py:1104
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1104
+#: nova/network/linux_net.py:1106
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1280
+#: nova/network/linux_net.py:1282
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1283
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1401
+#: nova/network/linux_net.py:1403
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1447
+#: nova/network/linux_net.py:1449
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1459
+#: nova/network/linux_net.py:1461
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1495
+#: nova/network/linux_net.py:1497
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1732
+#: nova/network/linux_net.py:1734
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1740
+#: nova/network/linux_net.py:1742
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
@@ -5464,38 +5401,38 @@ msgid ""
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1104
+#: nova/network/manager.py:1105
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1107
+#: nova/network/manager.py:1108
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1119
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1175
+#: nova/network/manager.py:1176
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1194
+#: nova/network/manager.py:1195
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1794
+#: nova/network/manager.py:1795
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1801
+#: nova/network/manager.py:1802
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5531,7 +5468,7 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:375
+#: nova/network/model.py:379
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
@@ -5613,65 +5550,65 @@ msgstr ""
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:104
+#: nova/network/security_group/quantum_driver.py:106
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:107
-#: nova/network/security_group/quantum_driver.py:153
-#: nova/network/security_group/quantum_driver.py:242
+#: nova/network/security_group/quantum_driver.py:109
+#: nova/network/security_group/quantum_driver.py:155
+#: nova/network/security_group/quantum_driver.py:244
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
+#: nova/network/security_group/quantum_driver.py:129
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:137
+#: nova/network/security_group/quantum_driver.py:139
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:171
+#: nova/network/security_group/quantum_driver.py:173
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:175
-#: nova/network/security_group/quantum_driver.py:340
-#: nova/network/security_group/quantum_driver.py:346
-#: nova/network/security_group/quantum_driver.py:373
-#: nova/network/security_group/quantum_driver.py:388
-#: nova/network/security_group/quantum_driver.py:394
-#: nova/network/security_group/quantum_driver.py:423
+#: nova/network/security_group/quantum_driver.py:177
+#: nova/network/security_group/quantum_driver.py:342
+#: nova/network/security_group/quantum_driver.py:348
+#: nova/network/security_group/quantum_driver.py:375
+#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:396
+#: nova/network/security_group/quantum_driver.py:425
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:228
+#: nova/network/security_group/quantum_driver.py:230
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:239
+#: nova/network/security_group/quantum_driver.py:241
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:356
+#: nova/network/security_group/quantum_driver.py:358
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:416
+#: nova/network/security_group/quantum_driver.py:368
+#: nova/network/security_group/quantum_driver.py:418
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:426
+#: nova/network/security_group/quantum_driver.py:428
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5688,27 +5625,27 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:98
+#: nova/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:184
+#: nova/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:195
+#: nova/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:222
+#: nova/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:230
+#: nova/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -5718,17 +5655,17 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:347
+#: nova/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: nova/openstack/common/log.py:397
+#: nova/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:563
+#: nova/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5801,11 +5738,91 @@ msgstr ""
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
+#: nova/openstack/common/processutils.py:167
+#: nova/openstack/common/processutils.py:240 nova/virt/powervm/common.py:117
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
 #: nova/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
+#: nova/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: nova/openstack/common/service.py:113 nova/openstack/common/service.py:276
+msgid "Full set of CONF:"
+msgstr ""
+
+#: nova/openstack/common/service.py:122 nova/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: nova/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: nova/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: nova/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: nova/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: nova/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: nova/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: nova/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: nova/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: nova/openstack/common/strutils.py:72
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
 #: nova/openstack/common/db/sqlalchemy/session.py:461
 msgid "DB exception wrapped."
 msgstr ""
@@ -5944,58 +5961,63 @@ msgstr ""
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:74
+#: nova/openstack/common/rpc/common.py:75
 #, fuzzy
 msgid "An unknown RPC related exception occurred."
 msgstr "發生一個未知例外"
 
-#: nova/openstack/common/rpc/common.py:104
+#: nova/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:121
+#: nova/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:137
 #: nova/openstack/common/rpc/common.py:138
 #: nova/openstack/common/rpc/common.py:139
+#: nova/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:143
+#: nova/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:147
+#: nova/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:151
+#: nova/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:156
+#: nova/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:280
+#: nova/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: nova/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/common.py:302
+#: nova/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -6310,7 +6332,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:335
+#: nova/scheduler/driver.py:339
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -6319,36 +6341,48 @@ msgstr ""
 
 #: nova/scheduler/filter_scheduler.py:73
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"Attempting to build %(num_instances)d instance(s) uuids: "
+"%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:227
+#: nova/scheduler/filter_scheduler.py:77
+#, python-format
+msgid "Request Spec: %s"
+msgstr ""
+
+#: nova/scheduler/filter_scheduler.py:97
+#, fuzzy, python-format
+msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
+msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
+
+#: nova/scheduler/filter_scheduler.py:239
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:244
+#: nova/scheduler/filter_scheduler.py:256
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:276
+#: nova/scheduler/filter_scheduler.py:288
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:344
+#: nova/scheduler/filter_scheduler.py:356
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:357
+#: nova/scheduler/filter_scheduler.py:361
 #, python-format
-msgid "Choosing host %(chosen_host)s"
+msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:391
+#: nova/scheduler/filter_scheduler.py:403
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6543,46 +6577,46 @@ msgstr ""
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:76
+#: nova/servicegroup/drivers/db.py:72
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:99 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:95 nova/servicegroup/drivers/mc.py:99
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:105 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:101 nova/servicegroup/drivers/mc.py:105
 msgid "model server went away"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:44
+#: nova/servicegroup/drivers/mc.py:43
 msgid "memcached_servers not defined"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:52
+#: nova/servicegroup/drivers/mc.py:51
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:57
+#: nova/servicegroup/drivers/mc.py:56
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:74
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
@@ -6635,58 +6669,42 @@ msgstr ""
 msgid "Attempted to instantiate singleton"
 msgstr ""
 
-#: nova/tests/fake_utils.py:72
+#: nova/tests/fake_processutils.py:71
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:80
+#: nova/tests/fake_processutils.py:79
 #, python-format
 msgid "Faked command matched %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:96
+#: nova/tests/fake_processutils.py:95
 #, python-format
 msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: nova/tests/fake_utils.py:101
+#: nova/tests/fake_processutils.py:100
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:187
+#: nova/tests/fake_volume.py:188
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:228
+#: nova/tests/fake_volume.py:192 nova/volume/cinder.py:238
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:195 nova/volume/cinder.py:232
+#: nova/tests/fake_volume.py:196 nova/volume/cinder.py:242
 msgid "Instance and volume not in same availability_zone"
 msgstr ""
 
-#: nova/tests/fake_volume.py:200 nova/volume/cinder.py:238
+#: nova/tests/fake_volume.py:201 nova/volume/cinder.py:248
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:892
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:896
-msgid "Expected a list for 'auth' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:900
-msgid "Expected a function in 'auth[0]' parameter"
-msgstr ""
-
-#: nova/tests/fakelibvirt.py:904
-msgid "Expected a function in 'auth[1]' parameter"
-msgstr ""
-
 #: nova/tests/test_hypervapi.py:433
 msgid "fake vswitch not found"
 msgstr ""
@@ -6720,17 +6738,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3340
+#: nova/tests/api/openstack/compute/test_servers.py:3365
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3345
+#: nova/tests/api/openstack/compute/test_servers.py:3370
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3350
+#: nova/tests/api/openstack/compute/test_servers.py:3375
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6739,7 +6757,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:1168
 #: nova/tests/compute/test_compute.py:1195
 #: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:3725
+#: nova/tests/compute/test_compute.py:3804
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
@@ -6756,16 +6774,16 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3736
+#: nova/tests/compute/test_compute.py:3815
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4238
+#: nova/tests/compute/test_compute.py:4315
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:8725
+#: nova/tests/compute/test_compute.py:8904
 msgid "spawn error"
 msgstr ""
 
@@ -6861,6 +6879,22 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
+#: nova/tests/virt/libvirt/fakelibvirt.py:892
+msgid "Please extend mock libvirt module to support flags"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:896
+msgid "Expected a list for 'auth' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:900
+msgid "Expected a function in 'auth[0]' parameter"
+msgstr ""
+
+#: nova/tests/virt/libvirt/fakelibvirt.py:904
+msgid "Expected a function in 'auth[1]' parameter"
+msgstr ""
+
 #: nova/virt/configdrive.py:97
 #, python-format
 msgid "Added %(filepath)s to config drive"
@@ -6885,11 +6919,10 @@ msgid "Loading compute driver '%s'"
 msgstr ""
 
 #: nova/virt/driver.py:962
-#, python-format
-msgid "Unable to load the virtualization driver: %s"
+msgid "Unable to load the virtualization driver"
 msgstr ""
 
-#: nova/virt/fake.py:210
+#: nova/virt/fake.py:212
 #, python-format
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
@@ -7014,19 +7047,19 @@ msgstr ""
 "標準輸出: %(stdout)r\n"
 "標準錯誤輸出: %(stderr)r"
 
-#: nova/virt/baremetal/ipmi.py:161
+#: nova/virt/baremetal/ipmi.py:157
 msgid "IPMI power on failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:183
+#: nova/virt/baremetal/ipmi.py:179
 msgid "IPMI power off failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:193
+#: nova/virt/baremetal/ipmi.py:189
 msgid "IPMI set next bootdev failed"
 msgstr ""
 
-#: nova/virt/baremetal/ipmi.py:198 nova/virt/baremetal/tilera_pdu.py:153
+#: nova/virt/baremetal/ipmi.py:201 nova/virt/baremetal/tilera_pdu.py:153
 #, python-format
 msgid "Activate node called, but node %s is already active"
 msgstr ""
@@ -7194,15 +7227,15 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:112
+#: nova/virt/baremetal/virtual_power_driver.py:111
 msgid "virtual_power_ssh_host not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:116
+#: nova/virt/baremetal/virtual_power_driver.py:115
 msgid "virtual_power_host_user not defined. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:122
+#: nova/virt/baremetal/virtual_power_driver.py:121
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
@@ -7260,97 +7293,97 @@ msgstr ""
 msgid "Checking if we can resize image %(image)s. size=%(size)s, CoW=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:139
+#: nova/virt/disk/api.py:140
 #, python-format
 msgid "Cannot resize filesystem %s to a smaller size."
 msgstr ""
 
-#: nova/virt/disk/api.py:150
+#: nova/virt/disk/api.py:151
 #, python-format
 msgid "Unable to mount image %(image)s with error %(error)s. Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:160
+#: nova/virt/disk/api.py:161
 #, python-format
 msgid ""
 "Unable to determine label for image %(image)s with error %(errror)s. "
 "Cannot resize."
 msgstr ""
 
-#: nova/virt/disk/api.py:227
+#: nova/virt/disk/api.py:228
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:283
+#: nova/virt/disk/api.py:284
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
-" admin_password=ha-ha-not-telling-you files=%(files)s "
-"partition=%(partition)s use_cow=%(use_cow)s"
+" admin_password=<SANITIZED> files=%(files)s partition=%(partition)s "
+"use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:300
+#: nova/virt/disk/api.py:302
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:319
+#: nova/virt/disk/api.py:321
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:336
+#: nova/virt/disk/api.py:338
 #, python-format
 msgid "Failed to teardown ntainer filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:349
+#: nova/virt/disk/api.py:351
 #, python-format
 msgid "Failed to umount container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:374
+#: nova/virt/disk/api.py:376
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:386
+#: nova/virt/disk/api.py:388
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:395
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:436
+#: nova/virt/disk/api.py:438
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:465
+#: nova/virt/disk/api.py:466
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
 #: nova/virt/disk/api.py:491
 #, python-format
-msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
+msgid "Inject admin password fs=%(fs)s admin_passwd=<SANITIZED>"
 msgstr ""
 
-#: nova/virt/disk/api.py:536
+#: nova/virt/disk/api.py:535
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:565
+#: nova/virt/disk/api.py:564
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:581
+#: nova/virt/disk/api.py:580
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -7684,7 +7717,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3835
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3833
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7698,24 +7731,24 @@ msgstr ""
 msgid "Host IP address is: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:48
+#: nova/virt/hyperv/imagecache.py:49
 #, python-format
 msgid "The image is not a valid VHD: %s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:68
+#: nova/virt/hyperv/imagecache.py:69
 #, python-format
 msgid ""
 "Cannot resize the image to a size smaller than the VHD max. internal "
 "size: %(vhd_size)s. Requested disk size: %(root_vhd_size)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:83
+#: nova/virt/hyperv/imagecache.py:84
 #, python-format
 msgid "Copying VHD %(vhd_path)s to %(resized_vhd_path)s"
 msgstr ""
 
-#: nova/virt/hyperv/imagecache.py:86
+#: nova/virt/hyperv/imagecache.py:87
 #, python-format
 msgid "Resizing VHD %(resized_vhd_path)s to new size %(root_vhd_size)s"
 msgstr ""
@@ -8036,12 +8069,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1876
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1874
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1883
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1881
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8200,7 +8233,7 @@ msgstr "�載_Volume: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:902
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:903
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8268,202 +8301,202 @@ msgstr ""
 msgid "Connection to libvirt failed: %s"
 msgstr "連接到glance失敗"
 
-#: nova/virt/libvirt/driver.py:727
+#: nova/virt/libvirt/driver.py:728
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:742
+#: nova/virt/libvirt/driver.py:743
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:747
+#: nova/virt/libvirt/driver.py:748
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:758
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:767
+#: nova/virt/libvirt/driver.py:768
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:786
+#: nova/virt/libvirt/driver.py:787
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:802
+#: nova/virt/libvirt/driver.py:803
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:822
+#: nova/virt/libvirt/driver.py:823
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:828
+#: nova/virt/libvirt/driver.py:829
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:857
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:865
+#: nova/virt/libvirt/driver.py:866
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:909
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:916
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:920
+#: nova/virt/libvirt/driver.py:921
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1042
+#: nova/virt/libvirt/driver.py:1043
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1066
+#: nova/virt/libvirt/driver.py:1067
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1086
+#: nova/virt/libvirt/driver.py:1087
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1090
+#: nova/virt/libvirt/driver.py:1091
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1179
+#: nova/virt/libvirt/driver.py:1177
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1180
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1211
+#: nova/virt/libvirt/driver.py:1209
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1223
+#: nova/virt/libvirt/driver.py:1221
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1296
+#: nova/virt/libvirt/driver.py:1294
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1298
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1333
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1341
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1389
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1537
+#: nova/virt/libvirt/driver.py:1535
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1544 nova/virt/powervm/operator.py:221
+#: nova/virt/libvirt/driver.py:1542 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1558
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1597 nova/virt/libvirt/driver.py:1623
+#: nova/virt/libvirt/driver.py:1595 nova/virt/libvirt/driver.py:1621
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1612
+#: nova/virt/libvirt/driver.py:1610
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "使用者並沒有管�者權力"
 
-#: nova/virt/libvirt/driver.py:1681
+#: nova/virt/libvirt/driver.py:1679
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1683
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1690 nova/virt/libvirt/driver.py:1695
+#: nova/virt/libvirt/driver.py:1688 nova/virt/libvirt/driver.py:1693
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1766
+#: nova/virt/libvirt/driver.py:1764
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1867
+#: nova/virt/libvirt/driver.py:1865
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1916
+#: nova/virt/libvirt/driver.py:1914
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1926
+#: nova/virt/libvirt/driver.py:1924
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1983
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1989
+#: nova/virt/libvirt/driver.py:1987
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1993
+#: nova/virt/libvirt/driver.py:1991
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:1995
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2013
+#: nova/virt/libvirt/driver.py:2011
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2337
+#: nova/virt/libvirt/driver.py:2335
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8471,73 +8504,73 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2352
+#: nova/virt/libvirt/driver.py:2350
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2367
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2547 nova/virt/libvirt/driver.py:2551
+#: nova/virt/libvirt/driver.py:2545 nova/virt/libvirt/driver.py:2549
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2560
+#: nova/virt/libvirt/driver.py:2558
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2567
+#: nova/virt/libvirt/driver.py:2565
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2570
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2589
+#: nova/virt/libvirt/driver.py:2587
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2599
+#: nova/virt/libvirt/driver.py:2597
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2651
+#: nova/virt/libvirt/driver.py:2649
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2657
+#: nova/virt/libvirt/driver.py:2655
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2659
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2721
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2807
+#: nova/virt/libvirt/driver.py:2805
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "無法�載 Volume %s"
 
-#: nova/virt/libvirt/driver.py:2820
+#: nova/virt/libvirt/driver.py:2818
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8545,50 +8578,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2836
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2841
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2920
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3002
+#: nova/virt/libvirt/driver.py:3000
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3010
+#: nova/virt/libvirt/driver.py:3008
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3047
+#: nova/virt/libvirt/driver.py:3045
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3072
+#: nova/virt/libvirt/driver.py:3070
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3082
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8598,67 +8631,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3099
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3149
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3221
+#: nova/virt/libvirt/driver.py:3219
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3314
+#: nova/virt/libvirt/driver.py:3312
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3426
+#: nova/virt/libvirt/driver.py:3424
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3443
+#: nova/virt/libvirt/driver.py:3441
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3448
+#: nova/virt/libvirt/driver.py:3446
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3489
+#: nova/virt/libvirt/driver.py:3487
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3558
+#: nova/virt/libvirt/driver.py:3556
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3619
+#: nova/virt/libvirt/driver.py:3617
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3625
+#: nova/virt/libvirt/driver.py:3623
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3687
+#: nova/virt/libvirt/driver.py:3685
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3808
+#: nova/virt/libvirt/driver.py:3806
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8691,153 +8724,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:298
+#: nova/virt/libvirt/imagebackend.py:294
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:383
+#: nova/virt/libvirt/imagebackend.py:378
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:140
+#: nova/virt/libvirt/imagecache.py:139
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:180
+#: nova/virt/libvirt/imagecache.py:178
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:202
+#: nova/virt/libvirt/imagecache.py:200
 #, python-format
 msgid "Writing stored info to %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:332
+#: nova/virt/libvirt/imagecache.py:329
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:335
+#: nova/virt/libvirt/imagecache.py:332
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:334
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:350
+#: nova/virt/libvirt/imagecache.py:347
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:432
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:445
+#: nova/virt/libvirt/imagecache.py:441
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:460
+#: nova/virt/libvirt/imagecache.py:456
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:472
+#: nova/virt/libvirt/imagecache.py:468
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:475
+#: nova/virt/libvirt/imagecache.py:471
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:482
+#: nova/virt/libvirt/imagecache.py:478
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:493
+#: nova/virt/libvirt/imagecache.py:489
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:517
+#: nova/virt/libvirt/imagecache.py:513
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:529
+#: nova/virt/libvirt/imagecache.py:525
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:541
+#: nova/virt/libvirt/imagecache.py:537
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:548
+#: nova/virt/libvirt/imagecache.py:544
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:572
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:576
+#: nova/virt/libvirt/imagecache.py:572
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:583
+#: nova/virt/libvirt/imagecache.py:579
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:601
+#: nova/virt/libvirt/imagecache.py:597
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:606
+#: nova/virt/libvirt/imagecache.py:602
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:609
+#: nova/virt/libvirt/imagecache.py:605
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:613
+#: nova/virt/libvirt/imagecache.py:609
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:621
+#: nova/virt/libvirt/imagecache.py:617
 msgid "Verification complete"
 msgstr ""
 
@@ -8950,87 +8983,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:239
+#: nova/virt/libvirt/volume.py:238
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:242
+#: nova/virt/libvirt/volume.py:241
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:253
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:490 nova/virt/libvirt/volume.py:611
+#: nova/virt/libvirt/volume.py:507 nova/virt/libvirt/volume.py:628
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:546
+#: nova/virt/libvirt/volume.py:563
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:548
+#: nova/virt/libvirt/volume.py:565
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:690
+#: nova/virt/libvirt/volume.py:707
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:699
+#: nova/virt/libvirt/volume.py:716
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:709
+#: nova/virt/libvirt/volume.py:726
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:712
+#: nova/virt/libvirt/volume.py:729
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:728
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:735
+#: nova/virt/libvirt/volume.py:752
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:801
+#: nova/virt/libvirt/volume.py:818
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:812
+#: nova/virt/libvirt/volume.py:829
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:818
+#: nova/virt/libvirt/volume.py:835
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:833
+#: nova/virt/libvirt/volume.py:850
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9103,35 +9136,35 @@ msgstr ""
 msgid "Uncompressed image file not found"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:675
+#: nova/virt/powervm/blockdev.py:542 nova/virt/powervm/operator.py:674
 #, python-format
 msgid "Found error stream for command \"%(cmd)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:692
+#: nova/virt/powervm/blockdev.py:559 nova/virt/powervm/operator.py:691
 #, python-format
 msgid "Found error stream for command \"%(command)s\": %(error_text)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:68
+#: nova/virt/powervm/common.py:67
 msgid "Connection error connecting PowerVM manager"
 msgstr ""
 
-#: nova/virt/powervm/common.py:101
+#: nova/virt/powervm/common.py:100
 #, python-format
 msgid "Running cmd (SSH-as-root): %s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:150
+#: nova/virt/powervm/common.py:149
 msgid "File transfer to PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/common.py:169
+#: nova/virt/powervm/common.py:168
 #, python-format
 msgid "ftp GET %(remote_path)s to: %(local_path)s"
 msgstr ""
 
-#: nova/virt/powervm/common.py:175
+#: nova/virt/powervm/common.py:174
 #, fuzzy
 msgid "File transfer from PowerVM manager failed"
 msgstr "連接到glance失敗"
@@ -9224,74 +9257,74 @@ msgid ""
 "Continuing without storing"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:99
+#: nova/virt/powervm/operator.py:98
 #, python-format
 msgid "LPAR instance '%s' not found"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:187
+#: nova/virt/powervm/operator.py:186
 #, fuzzy, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr "建立虛擬介�失敗"
 
-#: nova/virt/powervm/operator.py:201
+#: nova/virt/powervm/operator.py:200
 #, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:203
+#: nova/virt/powervm/operator.py:202
 #, fuzzy, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr "建立虛擬介�失敗"
 
-#: nova/virt/powervm/operator.py:209
+#: nova/virt/powervm/operator.py:208
 #, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:226
+#: nova/virt/powervm/operator.py:225
 #, python-format
 msgid "Instance '%s' failed to boot"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:237
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:242
+#: nova/virt/powervm/operator.py:241
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:253
+#: nova/virt/powervm/operator.py:252
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:271
 #, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:295
+#: nova/virt/powervm/operator.py:294
 #, python-format
 msgid "Shutting down the instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:300
+#: nova/virt/powervm/operator.py:299
 #, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:312
+#: nova/virt/powervm/operator.py:311
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:334 nova/virt/powervm/operator.py:390
+#: nova/virt/powervm/operator.py:333 nova/virt/powervm/operator.py:389
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:345 nova/virt/powervm/operator.py:396
+#: nova/virt/powervm/operator.py:344 nova/virt/powervm/operator.py:395
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
@@ -9747,7 +9780,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1327
+#: nova/virt/vmwareapi/vmops.py:1041 nova/virt/xenapi/vmops.py:1374
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -9907,19 +9940,19 @@ msgstr "無法�載 Volume %s"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "掛載點 %(mountpoint)s 從虛擬機器 %(instance_name)s �載"
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1616
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1573
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1578
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1625
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -10023,24 +10056,24 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:354
+#: nova/virt/xenapi/driver.py:345
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:570
+#: nova/virt/xenapi/driver.py:561
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:630
+#: nova/virt/xenapi/driver.py:621
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:670
+#: nova/virt/xenapi/driver.py:661
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:754 nova/virt/xenapi/driver.py:768
+#: nova/virt/xenapi/driver.py:745 nova/virt/xenapi/driver.py:759
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -10177,374 +10210,374 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:272
+#: nova/virt/xenapi/vm_utils.py:273
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:284
+#: nova/virt/xenapi/vm_utils.py:285
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:289 nova/virt/xenapi/vm_utils.py:304
+#: nova/virt/xenapi/vm_utils.py:290 nova/virt/xenapi/vm_utils.py:305
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:293
+#: nova/virt/xenapi/vm_utils.py:294
 msgid "Shutting down VM (cleanly)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 msgid "Shutting down VM (hard)"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:347
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:363
+#: nova/virt/xenapi/vm_utils.py:364
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:367
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:376
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:387
+#: nova/virt/xenapi/vm_utils.py:388
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:409
+#: nova/virt/xenapi/vm_utils.py:410
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:413
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:438
+#: nova/virt/xenapi/vm_utils.py:439
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:465
+#: nova/virt/xenapi/vm_utils.py:466
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:479
+#: nova/virt/xenapi/vm_utils.py:480
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:504
+#: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:590
+#: nova/virt/xenapi/vm_utils.py:591
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:635
+#: nova/virt/xenapi/vm_utils.py:636
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:648
+#: nova/virt/xenapi/vm_utils.py:649
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:698
+#: nova/virt/xenapi/vm_utils.py:699
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:951
+#: nova/virt/xenapi/vm_utils.py:952
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1007
+#: nova/virt/xenapi/vm_utils.py:1008
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1041
+#: nova/virt/xenapi/vm_utils.py:1042
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1053
+#: nova/virt/xenapi/vm_utils.py:1054
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1066
+#: nova/virt/xenapi/vm_utils.py:1067
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1100
+#: nova/virt/xenapi/vm_utils.py:1102
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1113
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1186
+#: nova/virt/xenapi/vm_utils.py:1188
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1201
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1205
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1227
+#: nova/virt/xenapi/vm_utils.py:1229
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1240
+#: nova/virt/xenapi/vm_utils.py:1242
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1249
+#: nova/virt/xenapi/vm_utils.py:1251
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1268
+#: nova/virt/xenapi/vm_utils.py:1270
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1282
+#: nova/virt/xenapi/vm_utils.py:1284
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1293
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1332
+#: nova/virt/xenapi/vm_utils.py:1334
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1363
+#: nova/virt/xenapi/vm_utils.py:1365
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1381
+#: nova/virt/xenapi/vm_utils.py:1383
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1387
+#: nova/virt/xenapi/vm_utils.py:1389
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1420
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1548
+#: nova/virt/xenapi/vm_utils.py:1550
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1576
+#: nova/virt/xenapi/vm_utils.py:1578
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1594
+#: nova/virt/xenapi/vm_utils.py:1596
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1607
+#: nova/virt/xenapi/vm_utils.py:1609
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1615
+#: nova/virt/xenapi/vm_utils.py:1617
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1617
+#: nova/virt/xenapi/vm_utils.py:1619
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1622
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1625
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1627
+#: nova/virt/xenapi/vm_utils.py:1629
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1629
+#: nova/virt/xenapi/vm_utils.py:1631
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1634
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1637
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1640
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1660
+#: nova/virt/xenapi/vm_utils.py:1662
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1676
+#: nova/virt/xenapi/vm_utils.py:1678
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1730
+#: nova/virt/xenapi/vm_utils.py:1732
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1790
+#: nova/virt/xenapi/vm_utils.py:1792
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1877
+#: nova/virt/xenapi/vm_utils.py:1879
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1887
+#: nova/virt/xenapi/vm_utils.py:1889
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1922
+#: nova/virt/xenapi/vm_utils.py:1924
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1942
+#: nova/virt/xenapi/vm_utils.py:1944
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1955
+#: nova/virt/xenapi/vm_utils.py:1957
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1960
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1960
+#: nova/virt/xenapi/vm_utils.py:1962
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1965
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1968
+#: nova/virt/xenapi/vm_utils.py:1970
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1976
+#: nova/virt/xenapi/vm_utils.py:1978
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2003
+#: nova/virt/xenapi/vm_utils.py:2005
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2011
+#: nova/virt/xenapi/vm_utils.py:2013
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2013
+#: nova/virt/xenapi/vm_utils.py:2015
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2015
+#: nova/virt/xenapi/vm_utils.py:2017
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10552,55 +10585,62 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2032
+#: nova/virt/xenapi/vm_utils.py:2034
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2038
+#: nova/virt/xenapi/vm_utils.py:2040
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2063
+#: nova/virt/xenapi/vm_utils.py:2065
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2076
+#: nova/virt/xenapi/vm_utils.py:2078
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2130
+#: nova/virt/xenapi/vm_utils.py:2119
+#, python-format
+msgid ""
+"Resize down not allowed because minimum filesystem sectors "
+"%(min_sectors)d is too big for target sectors %(new_sectors)d"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:2150
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2163
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2215
+#: nova/virt/xenapi/vm_utils.py:2235
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2224
+#: nova/virt/xenapi/vm_utils.py:2244
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2336
+#: nova/virt/xenapi/vm_utils.py:2356
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:795
+#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:801
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -10614,193 +10654,203 @@ msgstr ""
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:295
+#: nova/virt/xenapi/vmops.py:301
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:381
+#: nova/virt/xenapi/vmops.py:387
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:454
+#: nova/virt/xenapi/vmops.py:460
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:485
+#: nova/virt/xenapi/vmops.py:491
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:584
+#: nova/virt/xenapi/vmops.py:590
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:630
+#: nova/virt/xenapi/vmops.py:636
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:642
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:650
+#: nova/virt/xenapi/vmops.py:656
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:659
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:664
+#: nova/virt/xenapi/vmops.py:670
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:695
+#: nova/virt/xenapi/vmops.py:701
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:706
+#: nova/virt/xenapi/vmops.py:712
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764
+#: nova/virt/xenapi/vmops.py:770
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:768
+#: nova/virt/xenapi/vmops.py:774
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:776
+#: nova/virt/xenapi/vmops.py:782
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:813
-#, python-format
-msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
+#: nova/virt/xenapi/vmops.py:808
+msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819 nova/virt/xenapi/vmops.py:869
+#: nova/virt/xenapi/vmops.py:812
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:898
+#: nova/virt/xenapi/vmops.py:816
+#, fuzzy
+msgid "Unable to terminate instance."
+msgstr "無法掛載Volume 到虛擬機器 %s"
+
+#: nova/virt/xenapi/vmops.py:821
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:943
+#: nova/virt/xenapi/vmops.py:874
+msgid ""
+"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
+"%{exception}."
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:990
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:948
+#: nova/virt/xenapi/vmops.py:995
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:992
+#: nova/virt/xenapi/vmops.py:1039
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:998
+#: nova/virt/xenapi/vmops.py:1045
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1092
+#: nova/virt/xenapi/vmops.py:1139
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1096
+#: nova/virt/xenapi/vmops.py:1143
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1123
+#: nova/virt/xenapi/vmops.py:1170
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1130
+#: nova/virt/xenapi/vmops.py:1177
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1137
+#: nova/virt/xenapi/vmops.py:1184
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1164
+#: nova/virt/xenapi/vmops.py:1211
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1193
+#: nova/virt/xenapi/vmops.py:1240
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1244
+#: nova/virt/xenapi/vmops.py:1291
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1278
+#: nova/virt/xenapi/vmops.py:1325
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1331
+#: nova/virt/xenapi/vmops.py:1378
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1471
+#: nova/virt/xenapi/vmops.py:1518
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1490
+#: nova/virt/xenapi/vmops.py:1537
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1499
+#: nova/virt/xenapi/vmops.py:1546
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1502
+#: nova/virt/xenapi/vmops.py:1549
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1530
+#: nova/virt/xenapi/vmops.py:1577
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/vmops.py:1675
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1649
+#: nova/virt/xenapi/vmops.py:1696
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1661
+#: nova/virt/xenapi/vmops.py:1708
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1735
+#: nova/virt/xenapi/vmops.py:1782
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1746
+#: nova/virt/xenapi/vmops.py:1793
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1799
+#: nova/virt/xenapi/vmops.py:1846
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -10928,16 +10978,25 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:94
+#: nova/volume/cinder.py:98
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""
 
-#: nova/volume/cinder.py:219
+#: nova/volume/cinder.py:229
 msgid "status must be 'in-use'"
 msgstr ""
 
-#: nova/volume/cinder.py:225
+#: nova/volume/cinder.py:235
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "%(flag)s : FLAG SET "
+#~ msgstr ""
+
+#~ msgid "Child %(pid)d exited with status %(code)d"
+#~ msgstr ""
+
+#~ msgid "Got update for instance %(instance_uuid)s: %(instance)s"
+#~ msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
+
diff --git a/nova/manager.py b/nova/manager.py
index 2a151827d..3f93250e1 100644
--- a/nova/manager.py
+++ b/nova/manager.py
@@ -86,14 +86,18 @@ class Manager(base.Base, periodic_task.PeriodicTasks):
         pluginmgr = pluginmanager.PluginManager('nova', self.__class__)
         pluginmgr.load_plugins()
 
-    def create_rpc_dispatcher(self, backdoor_port=None):
+    def create_rpc_dispatcher(self, backdoor_port=None, additional_apis=None):
         '''Get the rpc dispatcher for this manager.
 
         If a manager would like to set an rpc API version, or support more than
         one class as the target of rpc messages, override this method.
         '''
+        apis = []
+        if additional_apis:
+            apis.extend(additional_apis)
         base_rpc = baserpc.BaseRPCAPI(self.service_name, backdoor_port)
-        return rpc_dispatcher.RpcDispatcher([self, base_rpc])
+        apis.extend([self, base_rpc])
+        return rpc_dispatcher.RpcDispatcher(apis)
 
     def periodic_tasks(self, context, raise_on_error=False):
         """Tasks to be run at a periodic interval."""
diff --git a/nova/network/api.py b/nova/network/api.py
index 26bf03446..1654bb32c 100644
--- a/nova/network/api.py
+++ b/nova/network/api.py
@@ -21,6 +21,7 @@
 import functools
 import inspect
 
+from nova.cells import rpcapi as cells_rpcapi
 from nova.compute import flavors
 from nova.db import base
 from nova import exception
@@ -64,7 +65,8 @@ def refresh_cache(f):
 
 
 def update_instance_cache_with_nw_info(api, context, instance,
-                                       nw_info=None, conductor_api=None):
+                                       nw_info=None, conductor_api=None,
+                                       update_cells=True):
     try:
         if not isinstance(nw_info, network_model.NetworkInfo):
             nw_info = None
@@ -73,9 +75,20 @@ def update_instance_cache_with_nw_info(api, context, instance,
         # update cache
         cache = {'network_info': nw_info.json()}
         if conductor_api:
-            conductor_api.instance_info_cache_update(context, instance, cache)
+            rv = conductor_api.instance_info_cache_update(context,
+                                                          instance,
+                                                          cache)
         else:
-            api.db.instance_info_cache_update(context, instance['uuid'], cache)
+            rv = api.db.instance_info_cache_update(context,
+                                                   instance['uuid'],
+                                                   cache)
+        if update_cells:
+            cells_api = cells_rpcapi.CellsAPI()
+            try:
+                cells_api.instance_info_cache_update_at_top(context, rv)
+            except Exception:
+                LOG.exception(_("Failed to notify cells of instance info "
+                                "cache update"))
     except Exception:
         LOG.exception(_('Failed storing info cache'), instance=instance)
 
@@ -366,8 +379,13 @@ class API(base.Base):
     def get_instance_nw_info(self, context, instance, conductor_api=None):
         """Returns all network info related to an instance."""
         result = self._get_instance_nw_info(context, instance)
+        # NOTE(comstud): Don't update API cell with new info_cache every
+        # time we pull network info for an instance.  The periodic healing
+        # of info_cache causes too many cells messages.  Healing the API
+        # will happen separately.
         update_instance_cache_with_nw_info(self, context, instance,
-                                           result, conductor_api)
+                                           result, conductor_api,
+                                           update_cells=False)
         return result
 
     def _get_instance_nw_info(self, context, instance):
diff --git a/nova/openstack/common/jsonutils.py b/nova/openstack/common/jsonutils.py
index 0aab537a7..11af66daf 100644
--- a/nova/openstack/common/jsonutils.py
+++ b/nova/openstack/common/jsonutils.py
@@ -41,6 +41,8 @@ import json
 import types
 import xmlrpclib
 
+import six
+
 from nova.openstack.common import timeutils
 
 
@@ -93,7 +95,7 @@ def to_primitive(value, convert_instances=False, convert_datetime=True,
     # value of itertools.count doesn't get caught by nasty_type_tests
     # and results in infinite loop when list(value) is called.
     if type(value) == itertools.count:
-        return unicode(value)
+        return six.text_type(value)
 
     # FIXME(vish): Workaround for LP bug 852095. Without this workaround,
     #              tests that raise an exception in a mocked method that
@@ -137,12 +139,12 @@ def to_primitive(value, convert_instances=False, convert_datetime=True,
             return recursive(value.__dict__, level=level + 1)
         else:
             if any(test(value) for test in _nasty_type_tests):
-                return unicode(value)
+                return six.text_type(value)
             return value
     except TypeError:
         # Class objects are tricky since they may define something like
         # __iter__ defined but it isn't callable as list().
-        return unicode(value)
+        return six.text_type(value)
 
 
 def dumps(value, default=to_primitive, **kwargs):
diff --git a/nova/openstack/common/log.py b/nova/openstack/common/log.py
index e11f666fc..cdaba43ab 100644
--- a/nova/openstack/common/log.py
+++ b/nova/openstack/common/log.py
@@ -43,9 +43,9 @@ import traceback
 from oslo.config import cfg
 
 from nova.openstack.common.gettextutils import _
+from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
 from nova.openstack.common import local
-from nova.openstack.common import notifier
 
 
 _DEFAULT_LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
@@ -322,17 +322,6 @@ class JSONFormatter(logging.Formatter):
         return jsonutils.dumps(message)
 
 
-class PublishErrorsHandler(logging.Handler):
-    def emit(self, record):
-        if ('nova.openstack.common.notifier.log_notifier' in
-                CONF.notification_driver):
-            return
-        notifier.api.notify(None, 'error.publisher',
-                            'error_notification',
-                            notifier.api.ERROR,
-                            dict(error=record.msg))
-
-
 def _create_logging_excepthook(product_name):
     def logging_excepthook(type, value, tb):
         extra = {}
@@ -428,7 +417,10 @@ def _setup_logging_from_conf():
         log_root.addHandler(streamlog)
 
     if CONF.publish_errors:
-        log_root.addHandler(PublishErrorsHandler(logging.ERROR))
+        handler = importutils.import_object(
+            "nova.openstack.common.log_handler.PublishErrorsHandler",
+            logging.ERROR)
+        log_root.addHandler(handler)
 
     datefmt = CONF.log_date_format
     for handler in log_root.handlers:
diff --git a/nova/openstack/common/processutils.py b/nova/openstack/common/processutils.py
index 6474db4ad..de6179602 100644
--- a/nova/openstack/common/processutils.py
+++ b/nova/openstack/common/processutils.py
@@ -123,7 +123,7 @@ def execute(*cmd, **kwargs):
     elif isinstance(check_exit_code, int):
         check_exit_code = [check_exit_code]
 
-    if len(kwargs):
+    if kwargs:
         raise UnknownArgumentError(_('Got unknown keyword args '
                                      'to utils.execute: %r') % kwargs)
 
diff --git a/nova/openstack/common/rpc/common.py b/nova/openstack/common/rpc/common.py
index 4b2e5a71f..fcd954dd5 100644
--- a/nova/openstack/common/rpc/common.py
+++ b/nova/openstack/common/rpc/common.py
@@ -158,6 +158,10 @@ class UnsupportedRpcEnvelopeVersion(RPCException):
                 "not supported by this endpoint.")
 
 
+class RpcVersionCapError(RPCException):
+    message = _("Specified RPC version cap, %(version_cap)s, is too low")
+
+
 class Connection(object):
     """A connection, returned by rpc.create_connection().
 
diff --git a/nova/openstack/common/rpc/dispatcher.py b/nova/openstack/common/rpc/dispatcher.py
index 3c84671df..81d16bcee 100644
--- a/nova/openstack/common/rpc/dispatcher.py
+++ b/nova/openstack/common/rpc/dispatcher.py
@@ -84,6 +84,7 @@ minimum version that supports the new parameter should be specified.
 """
 
 from nova.openstack.common.rpc import common as rpc_common
+from nova.openstack.common.rpc import serializer as rpc_serializer
 
 
 class RpcDispatcher(object):
@@ -93,16 +94,38 @@ class RpcDispatcher(object):
     contains a list of underlying managers that have an API_VERSION attribute.
     """
 
-    def __init__(self, callbacks):
+    def __init__(self, callbacks, serializer=None):
         """Initialize the rpc dispatcher.
 
         :param callbacks: List of proxy objects that are an instance
                           of a class with rpc methods exposed.  Each proxy
                           object should have an RPC_API_VERSION attribute.
+        :param serializer: The Serializer object that will be used to
+                           deserialize arguments before the method call and
+                           to serialize the result after it returns.
         """
         self.callbacks = callbacks
+        if serializer is None:
+            serializer = rpc_serializer.NoOpSerializer()
+        self.serializer = serializer
         super(RpcDispatcher, self).__init__()
 
+    def _deserialize_args(self, context, kwargs):
+        """Helper method called to deserialize args before dispatch.
+
+        This calls our serializer on each argument, returning a new set of
+        args that have been deserialized.
+
+        :param context: The request context
+        :param kwargs: The arguments to be deserialized
+        :returns: A new set of deserialized args
+        """
+        new_kwargs = dict()
+        for argname, arg in kwargs.iteritems():
+            new_kwargs[argname] = self.serializer.deserialize_entity(context,
+                                                                     arg)
+        return new_kwargs
+
     def dispatch(self, ctxt, version, method, namespace, **kwargs):
         """Dispatch a message based on a requested version.
 
@@ -145,7 +168,9 @@ class RpcDispatcher(object):
             if not hasattr(proxyobj, method):
                 continue
             if is_compatible:
-                return getattr(proxyobj, method)(ctxt, **kwargs)
+                kwargs = self._deserialize_args(ctxt, kwargs)
+                result = getattr(proxyobj, method)(ctxt, **kwargs)
+                return self.serializer.serialize_entity(ctxt, result)
 
         if had_compatible:
             raise AttributeError("No such RPC function '%s'" % method)
diff --git a/nova/openstack/common/rpc/proxy.py b/nova/openstack/common/rpc/proxy.py
index daebcbfa7..dcdfc0864 100644
--- a/nova/openstack/common/rpc/proxy.py
+++ b/nova/openstack/common/rpc/proxy.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2012 Red Hat, Inc.
+# Copyright 2012-2013 Red Hat, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -23,6 +23,8 @@ For more information about rpc API version numbers, see:
 
 
 from nova.openstack.common import rpc
+from nova.openstack.common.rpc import common as rpc_common
+from nova.openstack.common.rpc import serializer as rpc_serializer
 
 
 class RpcProxy(object):
@@ -34,16 +36,28 @@ class RpcProxy(object):
     rpc API.
     """
 
-    def __init__(self, topic, default_version):
+    # The default namespace, which can be overriden in a subclass.
+    RPC_API_NAMESPACE = None
+
+    def __init__(self, topic, default_version, version_cap=None,
+                 serializer=None):
         """Initialize an RpcProxy.
 
         :param topic: The topic to use for all messages.
         :param default_version: The default API version to request in all
                outgoing messages.  This can be overridden on a per-message
                basis.
+        :param version_cap: Optionally cap the maximum version used for sent
+               messages.
+        :param serializer: Optionaly (de-)serialize entities with a
+               provided helper.
         """
         self.topic = topic
         self.default_version = default_version
+        self.version_cap = version_cap
+        if serializer is None:
+            serializer = rpc_serializer.NoOpSerializer()
+        self.serializer = serializer
         super(RpcProxy, self).__init__()
 
     def _set_version(self, msg, vers):
@@ -52,7 +66,11 @@ class RpcProxy(object):
         :param msg: The message having a version added to it.
         :param vers: The version number to add to the message.
         """
-        msg['version'] = vers if vers else self.default_version
+        v = vers if vers else self.default_version
+        if (self.version_cap and not
+                rpc_common.version_is_compatible(self.version_cap, v)):
+            raise rpc_common.RpcVersionCapError(version=self.version_cap)
+        msg['version'] = v
 
     def _get_topic(self, topic):
         """Return the topic to use for a message."""
@@ -62,9 +80,25 @@ class RpcProxy(object):
     def make_namespaced_msg(method, namespace, **kwargs):
         return {'method': method, 'namespace': namespace, 'args': kwargs}
 
-    @staticmethod
-    def make_msg(method, **kwargs):
-        return RpcProxy.make_namespaced_msg(method, None, **kwargs)
+    def make_msg(self, method, **kwargs):
+        return self.make_namespaced_msg(method, self.RPC_API_NAMESPACE,
+                                        **kwargs)
+
+    def _serialize_msg_args(self, context, kwargs):
+        """Helper method called to serialize message arguments.
+
+        This calls our serializer on each argument, returning a new
+        set of args that have been serialized.
+
+        :param context: The request context
+        :param kwargs: The arguments to serialize
+        :returns: A new set of serialized arguments
+        """
+        new_kwargs = dict()
+        for argname, arg in kwargs.iteritems():
+            new_kwargs[argname] = self.serializer.serialize_entity(context,
+                                                                   arg)
+        return new_kwargs
 
     def call(self, context, msg, topic=None, version=None, timeout=None):
         """rpc.call() a remote method.
@@ -81,9 +115,11 @@ class RpcProxy(object):
         :returns: The return value from the remote method.
         """
         self._set_version(msg, version)
+        msg['args'] = self._serialize_msg_args(context, msg['args'])
         real_topic = self._get_topic(topic)
         try:
-            return rpc.call(context, real_topic, msg, timeout)
+            result = rpc.call(context, real_topic, msg, timeout)
+            return self.serializer.deserialize_entity(context, result)
         except rpc.common.Timeout as exc:
             raise rpc.common.Timeout(
                 exc.info, real_topic, msg.get('method'))
@@ -104,9 +140,11 @@ class RpcProxy(object):
                   from the remote method as they arrive.
         """
         self._set_version(msg, version)
+        msg['args'] = self._serialize_msg_args(context, msg['args'])
         real_topic = self._get_topic(topic)
         try:
-            return rpc.multicall(context, real_topic, msg, timeout)
+            result = rpc.multicall(context, real_topic, msg, timeout)
+            return self.serializer.deserialize_entity(context, result)
         except rpc.common.Timeout as exc:
             raise rpc.common.Timeout(
                 exc.info, real_topic, msg.get('method'))
@@ -124,6 +162,7 @@ class RpcProxy(object):
                   remote method.
         """
         self._set_version(msg, version)
+        msg['args'] = self._serialize_msg_args(context, msg['args'])
         rpc.cast(context, self._get_topic(topic), msg)
 
     def fanout_cast(self, context, msg, topic=None, version=None):
@@ -139,6 +178,7 @@ class RpcProxy(object):
                   from the remote method.
         """
         self._set_version(msg, version)
+        msg['args'] = self._serialize_msg_args(context, msg['args'])
         rpc.fanout_cast(context, self._get_topic(topic), msg)
 
     def cast_to_server(self, context, server_params, msg, topic=None,
@@ -157,6 +197,7 @@ class RpcProxy(object):
                   return values.
         """
         self._set_version(msg, version)
+        msg['args'] = self._serialize_msg_args(context, msg['args'])
         rpc.cast_to_server(context, server_params, self._get_topic(topic), msg)
 
     def fanout_cast_to_server(self, context, server_params, msg, topic=None,
@@ -175,5 +216,6 @@ class RpcProxy(object):
                   return values.
         """
         self._set_version(msg, version)
+        msg['args'] = self._serialize_msg_args(context, msg['args'])
         rpc.fanout_cast_to_server(context, server_params,
                                   self._get_topic(topic), msg)
diff --git a/nova/openstack/common/rpc/serializer.py b/nova/openstack/common/rpc/serializer.py
new file mode 100644
index 000000000..0a2c9c4f1
--- /dev/null
+++ b/nova/openstack/common/rpc/serializer.py
@@ -0,0 +1,52 @@
+#    Copyright 2013 IBM Corp.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""Provides the definition of an RPC serialization handler"""
+
+import abc
+
+
+class Serializer(object):
+    """Generic (de-)serialization definition base class"""
+    __metaclass__ = abc.ABCMeta
+
+    @abc.abstractmethod
+    def serialize_entity(self, context, entity):
+        """Serialize something to primitive form.
+
+        :param context: Security context
+        :param entity: Entity to be serialized
+        :returns: Serialized form of entity
+        """
+        pass
+
+    @abc.abstractmethod
+    def deserialize_entity(self, context, entity):
+        """Deserialize something from primitive form.
+
+        :param context: Security context
+        :param entity: Primitive to be deserialized
+        :returns: Deserialized form of entity
+        """
+        pass
+
+
+class NoOpSerializer(Serializer):
+    """A serializer that does nothing"""
+
+    def serialize_entity(self, context, entity):
+        return entity
+
+    def deserialize_entity(self, context, entity):
+        return entity
diff --git a/nova/openstack/common/service.py b/nova/openstack/common/service.py
new file mode 100644
index 000000000..a1f430999
--- /dev/null
+++ b/nova/openstack/common/service.py
@@ -0,0 +1,333 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# Copyright 2011 Justin Santa Barbara
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""Generic Node base class for all workers that run on hosts."""
+
+import errno
+import os
+import random
+import signal
+import sys
+import time
+
+import eventlet
+import logging as std_logging
+from oslo.config import cfg
+
+from nova.openstack.common import eventlet_backdoor
+from nova.openstack.common.gettextutils import _
+from nova.openstack.common import importutils
+from nova.openstack.common import log as logging
+from nova.openstack.common import threadgroup
+
+
+rpc = importutils.try_import('nova.openstack.common.rpc')
+CONF = cfg.CONF
+LOG = logging.getLogger(__name__)
+
+
+class Launcher(object):
+    """Launch one or more services and wait for them to complete."""
+
+    def __init__(self):
+        """Initialize the service launcher.
+
+        :returns: None
+
+        """
+        self._services = threadgroup.ThreadGroup()
+        self.backdoor_port = eventlet_backdoor.initialize_if_enabled()
+
+    @staticmethod
+    def run_service(service):
+        """Start and wait for a service to finish.
+
+        :param service: service to run and wait for.
+        :returns: None
+
+        """
+        service.start()
+        service.wait()
+
+    def launch_service(self, service):
+        """Load and start the given service.
+
+        :param service: The service you would like to start.
+        :returns: None
+
+        """
+        service.backdoor_port = self.backdoor_port
+        self._services.add_thread(self.run_service, service)
+
+    def stop(self):
+        """Stop all services which are currently running.
+
+        :returns: None
+
+        """
+        self._services.stop()
+
+    def wait(self):
+        """Waits until all services have been stopped, and then returns.
+
+        :returns: None
+
+        """
+        self._services.wait()
+
+
+class SignalExit(SystemExit):
+    def __init__(self, signo, exccode=1):
+        super(SignalExit, self).__init__(exccode)
+        self.signo = signo
+
+
+class ServiceLauncher(Launcher):
+    def _handle_signal(self, signo, frame):
+        # Allow the process to be killed again and die from natural causes
+        signal.signal(signal.SIGTERM, signal.SIG_DFL)
+        signal.signal(signal.SIGINT, signal.SIG_DFL)
+
+        raise SignalExit(signo)
+
+    def wait(self):
+        signal.signal(signal.SIGTERM, self._handle_signal)
+        signal.signal(signal.SIGINT, self._handle_signal)
+
+        LOG.debug(_('Full set of CONF:'))
+        CONF.log_opt_values(LOG, std_logging.DEBUG)
+
+        status = None
+        try:
+            super(ServiceLauncher, self).wait()
+        except SignalExit as exc:
+            signame = {signal.SIGTERM: 'SIGTERM',
+                       signal.SIGINT: 'SIGINT'}[exc.signo]
+            LOG.info(_('Caught %s, exiting'), signame)
+            status = exc.code
+        except SystemExit as exc:
+            status = exc.code
+        finally:
+            if rpc:
+                rpc.cleanup()
+            self.stop()
+        return status
+
+
+class ServiceWrapper(object):
+    def __init__(self, service, workers):
+        self.service = service
+        self.workers = workers
+        self.children = set()
+        self.forktimes = []
+
+
+class ProcessLauncher(object):
+    def __init__(self):
+        self.children = {}
+        self.sigcaught = None
+        self.running = True
+        rfd, self.writepipe = os.pipe()
+        self.readpipe = eventlet.greenio.GreenPipe(rfd, 'r')
+
+        signal.signal(signal.SIGTERM, self._handle_signal)
+        signal.signal(signal.SIGINT, self._handle_signal)
+
+    def _handle_signal(self, signo, frame):
+        self.sigcaught = signo
+        self.running = False
+
+        # Allow the process to be killed again and die from natural causes
+        signal.signal(signal.SIGTERM, signal.SIG_DFL)
+        signal.signal(signal.SIGINT, signal.SIG_DFL)
+
+    def _pipe_watcher(self):
+        # This will block until the write end is closed when the parent
+        # dies unexpectedly
+        self.readpipe.read()
+
+        LOG.info(_('Parent process has died unexpectedly, exiting'))
+
+        sys.exit(1)
+
+    def _child_process(self, service):
+        # Setup child signal handlers differently
+        def _sigterm(*args):
+            signal.signal(signal.SIGTERM, signal.SIG_DFL)
+            raise SignalExit(signal.SIGTERM)
+
+        signal.signal(signal.SIGTERM, _sigterm)
+        # Block SIGINT and let the parent send us a SIGTERM
+        signal.signal(signal.SIGINT, signal.SIG_IGN)
+
+        # Reopen the eventlet hub to make sure we don't share an epoll
+        # fd with parent and/or siblings, which would be bad
+        eventlet.hubs.use_hub()
+
+        # Close write to ensure only parent has it open
+        os.close(self.writepipe)
+        # Create greenthread to watch for parent to close pipe
+        eventlet.spawn_n(self._pipe_watcher)
+
+        # Reseed random number generator
+        random.seed()
+
+        launcher = Launcher()
+        launcher.run_service(service)
+
+    def _start_child(self, wrap):
+        if len(wrap.forktimes) > wrap.workers:
+            # Limit ourselves to one process a second (over the period of
+            # number of workers * 1 second). This will allow workers to
+            # start up quickly but ensure we don't fork off children that
+            # die instantly too quickly.
+            if time.time() - wrap.forktimes[0] < wrap.workers:
+                LOG.info(_('Forking too fast, sleeping'))
+                time.sleep(1)
+
+            wrap.forktimes.pop(0)
+
+        wrap.forktimes.append(time.time())
+
+        pid = os.fork()
+        if pid == 0:
+            # NOTE(johannes): All exceptions are caught to ensure this
+            # doesn't fallback into the loop spawning children. It would
+            # be bad for a child to spawn more children.
+            status = 0
+            try:
+                self._child_process(wrap.service)
+            except SignalExit as exc:
+                signame = {signal.SIGTERM: 'SIGTERM',
+                           signal.SIGINT: 'SIGINT'}[exc.signo]
+                LOG.info(_('Caught %s, exiting'), signame)
+                status = exc.code
+            except SystemExit as exc:
+                status = exc.code
+            except BaseException:
+                LOG.exception(_('Unhandled exception'))
+                status = 2
+            finally:
+                wrap.service.stop()
+
+            os._exit(status)
+
+        LOG.info(_('Started child %d'), pid)
+
+        wrap.children.add(pid)
+        self.children[pid] = wrap
+
+        return pid
+
+    def launch_service(self, service, workers=1):
+        wrap = ServiceWrapper(service, workers)
+
+        LOG.info(_('Starting %d workers'), wrap.workers)
+        while self.running and len(wrap.children) < wrap.workers:
+            self._start_child(wrap)
+
+    def _wait_child(self):
+        try:
+            # Don't block if no child processes have exited
+            pid, status = os.waitpid(0, os.WNOHANG)
+            if not pid:
+                return None
+        except OSError as exc:
+            if exc.errno not in (errno.EINTR, errno.ECHILD):
+                raise
+            return None
+
+        if os.WIFSIGNALED(status):
+            sig = os.WTERMSIG(status)
+            LOG.info(_('Child %(pid)d killed by signal %(sig)d'),
+                     dict(pid=pid, sig=sig))
+        else:
+            code = os.WEXITSTATUS(status)
+            LOG.info(_('Child %(pid)s exited with status %(code)d'),
+                     dict(pid=pid, code=code))
+
+        if pid not in self.children:
+            LOG.warning(_('pid %d not in child list'), pid)
+            return None
+
+        wrap = self.children.pop(pid)
+        wrap.children.remove(pid)
+        return wrap
+
+    def wait(self):
+        """Loop waiting on children to die and respawning as necessary"""
+
+        LOG.debug(_('Full set of CONF:'))
+        CONF.log_opt_values(LOG, std_logging.DEBUG)
+
+        while self.running:
+            wrap = self._wait_child()
+            if not wrap:
+                # Yield to other threads if no children have exited
+                # Sleep for a short time to avoid excessive CPU usage
+                # (see bug #1095346)
+                eventlet.greenthread.sleep(.01)
+                continue
+
+            while self.running and len(wrap.children) < wrap.workers:
+                self._start_child(wrap)
+
+        if self.sigcaught:
+            signame = {signal.SIGTERM: 'SIGTERM',
+                       signal.SIGINT: 'SIGINT'}[self.sigcaught]
+            LOG.info(_('Caught %s, stopping children'), signame)
+
+        for pid in self.children:
+            try:
+                os.kill(pid, signal.SIGTERM)
+            except OSError as exc:
+                if exc.errno != errno.ESRCH:
+                    raise
+
+        # Wait for children to die
+        if self.children:
+            LOG.info(_('Waiting on %d children to exit'), len(self.children))
+            while self.children:
+                self._wait_child()
+
+
+class Service(object):
+    """Service object for binaries running on hosts."""
+
+    def __init__(self, threads=1000):
+        self.tg = threadgroup.ThreadGroup(threads)
+
+    def start(self):
+        pass
+
+    def stop(self):
+        self.tg.stop()
+
+    def wait(self):
+        self.tg.wait()
+
+
+def launch(service, workers=None):
+    if workers:
+        launcher = ProcessLauncher()
+        launcher.launch_service(service, workers=workers)
+    else:
+        launcher = ServiceLauncher()
+        launcher.launch_service(service)
+    return launcher
diff --git a/nova/openstack/common/threadgroup.py b/nova/openstack/common/threadgroup.py
new file mode 100644
index 000000000..26a391f58
--- /dev/null
+++ b/nova/openstack/common/threadgroup.py
@@ -0,0 +1,121 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2012 Red Hat, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from eventlet import greenlet
+from eventlet import greenpool
+from eventlet import greenthread
+
+from nova.openstack.common import log as logging
+from nova.openstack.common import loopingcall
+
+
+LOG = logging.getLogger(__name__)
+
+
+def _thread_done(gt, *args, **kwargs):
+    """ Callback function to be passed to GreenThread.link() when we spawn()
+    Calls the :class:`ThreadGroup` to notify if.
+
+    """
+    kwargs['group'].thread_done(kwargs['thread'])
+
+
+class Thread(object):
+    """ Wrapper around a greenthread, that holds a reference to the
+    :class:`ThreadGroup`. The Thread will notify the :class:`ThreadGroup` when
+    it has done so it can be removed from the threads list.
+    """
+    def __init__(self, thread, group):
+        self.thread = thread
+        self.thread.link(_thread_done, group=group, thread=self)
+
+    def stop(self):
+        self.thread.kill()
+
+    def wait(self):
+        return self.thread.wait()
+
+
+class ThreadGroup(object):
+    """ The point of the ThreadGroup classis to:
+
+    * keep track of timers and greenthreads (making it easier to stop them
+      when need be).
+    * provide an easy API to add timers.
+    """
+    def __init__(self, thread_pool_size=10):
+        self.pool = greenpool.GreenPool(thread_pool_size)
+        self.threads = []
+        self.timers = []
+
+    def add_dynamic_timer(self, callback, initial_delay=None,
+                          periodic_interval_max=None, *args, **kwargs):
+        timer = loopingcall.DynamicLoopingCall(callback, *args, **kwargs)
+        timer.start(initial_delay=initial_delay,
+                    periodic_interval_max=periodic_interval_max)
+        self.timers.append(timer)
+
+    def add_timer(self, interval, callback, initial_delay=None,
+                  *args, **kwargs):
+        pulse = loopingcall.FixedIntervalLoopingCall(callback, *args, **kwargs)
+        pulse.start(interval=interval,
+                    initial_delay=initial_delay)
+        self.timers.append(pulse)
+
+    def add_thread(self, callback, *args, **kwargs):
+        gt = self.pool.spawn(callback, *args, **kwargs)
+        th = Thread(gt, self)
+        self.threads.append(th)
+
+    def thread_done(self, thread):
+        self.threads.remove(thread)
+
+    def stop(self):
+        current = greenthread.getcurrent()
+        for x in self.threads:
+            if x is current:
+                # don't kill the current thread.
+                continue
+            try:
+                x.stop()
+            except Exception as ex:
+                LOG.exception(ex)
+
+        for x in self.timers:
+            try:
+                x.stop()
+            except Exception as ex:
+                LOG.exception(ex)
+        self.timers = []
+
+    def wait(self):
+        for x in self.timers:
+            try:
+                x.wait()
+            except greenlet.GreenletExit:
+                pass
+            except Exception as ex:
+                LOG.exception(ex)
+        current = greenthread.getcurrent()
+        for x in self.threads:
+            if x is current:
+                continue
+            try:
+                x.wait()
+            except greenlet.GreenletExit:
+                pass
+            except Exception as ex:
+                LOG.exception(ex)
diff --git a/nova/quota.py b/nova/quota.py
index 8aaa3ed31..a1c877ecc 100644
--- a/nova/quota.py
+++ b/nova/quota.py
@@ -105,14 +105,18 @@ class DbQuotaDriver(object):
 
     def get_defaults(self, context, resources):
         """Given a list of resources, retrieve the default quotas.
+        Use the class quotas named `_DEFAULT_QUOTA_NAME` as default quotas,
+        if it exists.
 
         :param context: The request context, for access checks.
         :param resources: A dictionary of the registered resources.
         """
 
         quotas = {}
+        default_quotas = db.quota_class_get_default(context)
         for resource in resources.values():
-            quotas[resource.name] = resource.default
+            quotas[resource.name] = default_quotas.get(resource.name,
+                                                       resource.default)
 
         return quotas
 
@@ -180,6 +184,8 @@ class DbQuotaDriver(object):
         else:
             class_quotas = {}
 
+        default_quotas = self.get_defaults(context, resources)
+
         for resource in resources.values():
             # Omit default/quota class values
             if not defaults and resource.name not in project_quotas:
@@ -187,7 +193,7 @@ class DbQuotaDriver(object):
 
             quotas[resource.name] = dict(
                 limit=project_quotas.get(resource.name, class_quotas.get(
-                        resource.name, resource.default)),
+                        resource.name, default_quotas[resource.name])),
                 )
 
             # Include usages if desired.  This is optional because one
diff --git a/nova/scheduler/filter_scheduler.py b/nova/scheduler/filter_scheduler.py
index 566b7846d..186cecc14 100644
--- a/nova/scheduler/filter_scheduler.py
+++ b/nova/scheduler/filter_scheduler.py
@@ -69,7 +69,7 @@ class FilterScheduler(driver.Scheduler):
         notifier.notify(context, notifier.publisher_id("scheduler"),
                         'scheduler.run_instance.start', notifier.INFO, payload)
 
-        instance_uuids = request_spec.pop('instance_uuids')
+        instance_uuids = request_spec.get('instance_uuids')
         LOG.info(_("Attempting to build %(num_instances)d instance(s) "
                     "uuids: %(instance_uuids)s"),
                   {'num_instances': len(instance_uuids),
@@ -79,6 +79,11 @@ class FilterScheduler(driver.Scheduler):
         weighed_hosts = self._schedule(context, request_spec,
                                        filter_properties, instance_uuids)
 
+        # NOTE: Pop instance_uuids as individual creates do not need the
+        # set of uuids. Do not pop before here as the upper exception
+        # handler fo NoValidHost needs the uuid to set error state
+        instance_uuids = request_spec.pop('instance_uuids')
+
         # NOTE(comstud): Make sure we do not pass this through.  It
         # contains an instance of RpcContext that cannot be serialized.
         filter_properties.pop('context', None)
diff --git a/nova/service.py b/nova/service.py
index 12bab14c3..3731986c4 100644
--- a/nova/service.py
+++ b/nova/service.py
@@ -19,26 +19,20 @@
 
 """Generic Node base class for all workers that run on hosts."""
 
-import errno
 import inspect
 import os
 import random
-import signal
 import sys
-import time
 
-import eventlet
-import greenlet
 from oslo.config import cfg
 
 from nova import conductor
 from nova import context
 from nova import exception
-from nova.openstack.common import eventlet_backdoor
 from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
-from nova.openstack.common import loopingcall
 from nova.openstack.common import rpc
+from nova.openstack.common import service
 from nova import servicegroup
 from nova import utils
 from nova import version
@@ -119,275 +113,7 @@ CONF.register_opts(service_opts)
 CONF.import_opt('host', 'nova.netconf')
 
 
-class SignalExit(SystemExit):
-    def __init__(self, signo, exccode=1):
-        super(SignalExit, self).__init__(exccode)
-        self.signo = signo
-
-
-class Launcher(object):
-    """Launch one or more services and wait for them to complete."""
-
-    def __init__(self):
-        """Initialize the service launcher.
-
-        :returns: None
-
-        """
-        self._services = []
-        self.backdoor_port = eventlet_backdoor.initialize_if_enabled()
-
-    @staticmethod
-    def run_server(server):
-        """Start and wait for a server to finish.
-
-        :param service: Server to run and wait for.
-        :returns: None
-
-        """
-        server.start()
-        server.wait()
-
-    def launch_server(self, server):
-        """Load and start the given server.
-
-        :param server: The server you would like to start.
-        :returns: None
-
-        """
-        if self.backdoor_port is not None:
-            server.backdoor_port = self.backdoor_port
-        gt = eventlet.spawn(self.run_server, server)
-        self._services.append(gt)
-
-    def stop(self):
-        """Stop all services which are currently running.
-
-        :returns: None
-
-        """
-        for service in self._services:
-            service.kill()
-
-    def wait(self):
-        """Waits until all services have been stopped, and then returns.
-
-        :returns: None
-
-        """
-        for service in self._services:
-            try:
-                service.wait()
-            except greenlet.GreenletExit:
-                pass
-
-
-class ServiceLauncher(Launcher):
-    def _handle_signal(self, signo, frame):
-        # Allow the process to be killed again and die from natural causes
-        signal.signal(signal.SIGTERM, signal.SIG_DFL)
-        signal.signal(signal.SIGINT, signal.SIG_DFL)
-
-        raise SignalExit(signo)
-
-    def wait(self):
-        signal.signal(signal.SIGTERM, self._handle_signal)
-        signal.signal(signal.SIGINT, self._handle_signal)
-
-        LOG.debug(_('Full set of CONF:'))
-        for flag in CONF:
-            flag_get = CONF.get(flag, None)
-            # hide flag contents from log if contains a password
-            # should use secret flag when switch over to openstack-common
-            if ("_password" in flag or "_key" in flag or
-                    (flag == "sql_connection" and "mysql:" in flag_get)):
-                LOG.debug(_('%(flag)s : FLAG SET ') % locals())
-            else:
-                LOG.debug('%(flag)s : %(flag_get)s' % locals())
-
-        status = None
-        try:
-            super(ServiceLauncher, self).wait()
-        except SignalExit as exc:
-            signame = {signal.SIGTERM: 'SIGTERM',
-                       signal.SIGINT: 'SIGINT'}[exc.signo]
-            LOG.info(_('Caught %s, exiting'), signame)
-            status = exc.code
-        except SystemExit as exc:
-            status = exc.code
-        finally:
-            self.stop()
-        rpc.cleanup()
-
-        if status is not None:
-            sys.exit(status)
-
-
-class ServerWrapper(object):
-    def __init__(self, server, workers):
-        self.server = server
-        self.workers = workers
-        self.children = set()
-        self.forktimes = []
-
-
-class ProcessLauncher(object):
-    def __init__(self):
-        self.children = {}
-        self.sigcaught = None
-        self.running = True
-        rfd, self.writepipe = os.pipe()
-        self.readpipe = eventlet.greenio.GreenPipe(rfd, 'r')
-
-        signal.signal(signal.SIGTERM, self._handle_signal)
-        signal.signal(signal.SIGINT, self._handle_signal)
-
-    def _handle_signal(self, signo, frame):
-        self.sigcaught = signo
-        self.running = False
-
-        # Allow the process to be killed again and die from natural causes
-        signal.signal(signal.SIGTERM, signal.SIG_DFL)
-        signal.signal(signal.SIGINT, signal.SIG_DFL)
-
-    def _pipe_watcher(self):
-        # This will block until the write end is closed when the parent
-        # dies unexpectedly
-        self.readpipe.read()
-
-        LOG.info(_('Parent process has died unexpectedly, exiting'))
-
-        sys.exit(1)
-
-    def _child_process(self, server):
-        # Setup child signal handlers differently
-        def _sigterm(*args):
-            signal.signal(signal.SIGTERM, signal.SIG_DFL)
-            raise SignalExit(signal.SIGTERM)
-
-        signal.signal(signal.SIGTERM, _sigterm)
-        # Block SIGINT and let the parent send us a SIGTERM
-        signal.signal(signal.SIGINT, signal.SIG_IGN)
-
-        # Reopen the eventlet hub to make sure we don't share an epoll
-        # fd with parent and/or siblings, which would be bad
-        eventlet.hubs.use_hub()
-
-        # Close write to ensure only parent has it open
-        os.close(self.writepipe)
-        # Create greenthread to watch for parent to close pipe
-        eventlet.spawn(self._pipe_watcher)
-
-        # Reseed random number generator
-        random.seed()
-
-        launcher = Launcher()
-        launcher.run_server(server)
-
-    def _start_child(self, wrap):
-        if len(wrap.forktimes) > wrap.workers:
-            # Limit ourselves to one process a second (over the period of
-            # number of workers * 1 second). This will allow workers to
-            # start up quickly but ensure we don't fork off children that
-            # die instantly too quickly.
-            if time.time() - wrap.forktimes[0] < wrap.workers:
-                LOG.info(_('Forking too fast, sleeping'))
-                time.sleep(1)
-
-            wrap.forktimes.pop(0)
-
-        wrap.forktimes.append(time.time())
-
-        pid = os.fork()
-        if pid == 0:
-            # NOTE(johannes): All exceptions are caught to ensure this
-            # doesn't fallback into the loop spawning children. It would
-            # be bad for a child to spawn more children.
-            status = 0
-            try:
-                self._child_process(wrap.server)
-            except SignalExit as exc:
-                signame = {signal.SIGTERM: 'SIGTERM',
-                           signal.SIGINT: 'SIGINT'}[exc.signo]
-                LOG.info(_('Caught %s, exiting'), signame)
-                status = exc.code
-            except SystemExit as exc:
-                status = exc.code
-            except BaseException:
-                LOG.exception(_('Unhandled exception'))
-                status = 2
-            finally:
-                wrap.server.stop()
-
-            os._exit(status)
-
-        LOG.info(_('Started child %d'), pid)
-
-        wrap.children.add(pid)
-        self.children[pid] = wrap
-
-        return pid
-
-    def launch_server(self, server, workers=1):
-        wrap = ServerWrapper(server, workers)
-
-        LOG.info(_('Starting %d workers'), wrap.workers)
-        while self.running and len(wrap.children) < wrap.workers:
-            self._start_child(wrap)
-
-    def _wait_child(self):
-        try:
-            pid, status = os.wait()
-        except OSError as exc:
-            if exc.errno not in (errno.EINTR, errno.ECHILD):
-                raise
-            return None
-
-        if os.WIFSIGNALED(status):
-            sig = os.WTERMSIG(status)
-            LOG.info(_('Child %(pid)d killed by signal %(sig)d'), locals())
-        else:
-            code = os.WEXITSTATUS(status)
-            LOG.info(_('Child %(pid)d exited with status %(code)d'), locals())
-
-        if pid not in self.children:
-            LOG.warning(_('pid %d not in child list'), pid)
-            return None
-
-        wrap = self.children.pop(pid)
-        wrap.children.remove(pid)
-        return wrap
-
-    def wait(self):
-        """Loop waiting on children to die and respawning as necessary."""
-        while self.running:
-            wrap = self._wait_child()
-            if not wrap:
-                continue
-
-            while self.running and len(wrap.children) < wrap.workers:
-                self._start_child(wrap)
-
-        if self.sigcaught:
-            signame = {signal.SIGTERM: 'SIGTERM',
-                       signal.SIGINT: 'SIGINT'}[self.sigcaught]
-            LOG.info(_('Caught %s, stopping children'), signame)
-
-        for pid in self.children:
-            try:
-                os.kill(pid, signal.SIGTERM)
-            except OSError as exc:
-                if exc.errno != errno.ESRCH:
-                    raise
-
-        # Wait for children to die
-        if self.children:
-            LOG.info(_('Waiting on %d children to exit'), len(self.children))
-            while self.children:
-                self._wait_child()
-
-
-class Service(object):
+class Service(service.Service):
     """Service object for binaries running on hosts.
 
     A service takes a manager and enables rpc by listening to queues based
@@ -398,6 +124,7 @@ class Service(object):
                  periodic_enable=None, periodic_fuzzy_delay=None,
                  periodic_interval_max=None, db_allowed=True,
                  *args, **kwargs):
+        super(Service, self).__init__()
         self.host = host
         self.binary = binary
         self.topic = topic
@@ -417,7 +144,6 @@ class Service(object):
         self.periodic_fuzzy_delay = periodic_fuzzy_delay
         self.periodic_interval_max = periodic_interval_max
         self.saved_args, self.saved_kwargs = args, kwargs
-        self.timers = []
         self.backdoor_port = None
         self.conductor_api = conductor.API(use_local=db_allowed)
         self.conductor_api.wait_until_ready(context.get_admin_context())
@@ -464,9 +190,7 @@ class Service(object):
         LOG.debug(_("Join ServiceGroup membership for this service %s")
                   % self.topic)
         # Add service to the ServiceGroup membership group.
-        pulse = self.servicegroup_api.join(self.host, self.topic, self)
-        if pulse:
-            self.timers.append(pulse)
+        self.servicegroup_api.join(self.host, self.topic, self)
 
         if self.periodic_enable:
             if self.periodic_fuzzy_delay:
@@ -474,10 +198,10 @@ class Service(object):
             else:
                 initial_delay = None
 
-            periodic = loopingcall.DynamicLoopingCall(self.periodic_tasks)
-            periodic.start(initial_delay=initial_delay,
-                           periodic_interval_max=self.periodic_interval_max)
-            self.timers.append(periodic)
+            self.tg.add_dynamic_timer(self.periodic_tasks,
+                                     initial_delay=initial_delay,
+                                     periodic_interval_max=
+                                        self.periodic_interval_max)
 
     def _create_service_ref(self, context):
         svc_values = {
@@ -546,25 +270,12 @@ class Service(object):
             LOG.warn(_('Service killed that has no database entry'))
 
     def stop(self):
-        # Try to shut the connection down, but if we get any sort of
-        # errors, go ahead and ignore them.. as we're shutting down anyway
         try:
             self.conn.close()
         except Exception:
             pass
-        for x in self.timers:
-            try:
-                x.stop()
-            except Exception:
-                pass
-        self.timers = []
 
-    def wait(self):
-        for x in self.timers:
-            try:
-                x.wait()
-            except Exception:
-                pass
+        super(Service, self).stop()
 
     def periodic_tasks(self, raise_on_error=False):
         """Tasks to be run at a periodic interval."""
@@ -667,6 +378,10 @@ class WSGIService(object):
         self.server.wait()
 
 
+def process_launcher():
+    return service.ProcessLauncher()
+
+
 # NOTE(vish): the global launcher is to maintain the existing
 #             functionality of calling service.serve +
 #             service.wait
@@ -678,12 +393,7 @@ def serve(server, workers=None):
     if _launcher:
         raise RuntimeError(_('serve() can only be called once'))
 
-    if workers:
-        _launcher = ProcessLauncher()
-        _launcher.launch_server(server, workers=workers)
-    else:
-        _launcher = ServiceLauncher()
-        _launcher.launch_server(server)
+    _launcher = service.launch(server, workers=workers)
 
 
 def wait():
diff --git a/nova/servicegroup/drivers/db.py b/nova/servicegroup/drivers/db.py
index 24fcfd04f..22b25d61c 100644
--- a/nova/servicegroup/drivers/db.py
+++ b/nova/servicegroup/drivers/db.py
@@ -18,7 +18,6 @@ from oslo.config import cfg
 from nova import conductor
 from nova import context
 from nova.openstack.common import log as logging
-from nova.openstack.common import loopingcall
 from nova.openstack.common import timeutils
 from nova.servicegroup import api
 from nova import utils
@@ -47,11 +46,8 @@ class DbDriver(api.ServiceGroupDriver):
                                  ' ServiceGroup driver'))
         report_interval = service.report_interval
         if report_interval:
-            pulse = loopingcall.FixedIntervalLoopingCall(self._report_state,
-                                                         service)
-            pulse.start(interval=report_interval,
-                        initial_delay=report_interval)
-            return pulse
+            service.tg.add_timer(report_interval, self._report_state,
+                                 report_interval, service)
 
     def is_up(self, service_ref):
         """Moved from nova.utils
diff --git a/nova/servicegroup/drivers/mc.py b/nova/servicegroup/drivers/mc.py
index 86c27a3aa..6e8cda456 100644
--- a/nova/servicegroup/drivers/mc.py
+++ b/nova/servicegroup/drivers/mc.py
@@ -22,7 +22,6 @@ from oslo.config import cfg
 from nova import conductor
 from nova import context
 from nova.openstack.common import log as logging
-from nova.openstack.common import loopingcall
 from nova.openstack.common import memorycache
 from nova.openstack.common import timeutils
 from nova.servicegroup import api
@@ -58,11 +57,8 @@ class MemcachedDriver(api.ServiceGroupDriver):
                                  'Memcached based ServiceGroup driver'))
         report_interval = service.report_interval
         if report_interval:
-            pulse = loopingcall.FixedIntervalLoopingCall(self._report_state,
-                                                         service)
-            pulse.start(interval=report_interval,
-                        initial_delay=report_interval)
-            return pulse
+            service.tg.add_timer(report_interval, self._report_state,
+                                 report_interval, service)
 
     def is_up(self, service_ref):
         """Moved from nova.utils
diff --git a/nova/tests/api/openstack/compute/contrib/test_instance_actions.py b/nova/tests/api/openstack/compute/contrib/test_instance_actions.py
index 573385a52..871b831ac 100644
--- a/nova/tests/api/openstack/compute/contrib/test_instance_actions.py
+++ b/nova/tests/api/openstack/compute/contrib/test_instance_actions.py
@@ -178,6 +178,14 @@ class InstanceActionsTest(test.TestCase):
         self.assertRaises(exc.HTTPNotFound, self.controller.show, req,
                           FAKE_UUID, FAKE_REQUEST_ID)
 
+    def test_instance_not_found(self):
+        def fake_get(self, context, instance_uuid):
+            raise exception.InstanceNotFound(instance_id=instance_uuid)
+        self.stubs.Set(compute_api.API, 'get', fake_get)
+        req = fakes.HTTPRequest.blank('/v2/123/servers/12/os-instance-actions')
+        self.assertRaises(exc.HTTPNotFound, self.controller.index, req,
+                          FAKE_UUID)
+
 
 class InstanceActionsSerializerTest(test.TestCase):
     def setUp(self):
diff --git a/nova/tests/api/openstack/compute/contrib/test_services.py b/nova/tests/api/openstack/compute/contrib/test_services.py
index 57dd056ee..387a5eb21 100644
--- a/nova/tests/api/openstack/compute/contrib/test_services.py
+++ b/nova/tests/api/openstack/compute/contrib/test_services.py
@@ -21,6 +21,7 @@ from nova import context
 from nova import db
 from nova import exception
 from nova.openstack.common import timeutils
+from nova.servicegroup.drivers import db as db_driver
 from nova import test
 from nova.tests.api.openstack import fakes
 
@@ -202,3 +203,13 @@ class ServicesTest(test.TestCase):
         res_dict = self.controller.update(req, "disable", body)
 
         self.assertEqual(res_dict['service']['status'], 'disabled')
+
+    # This test is just to verify that the servicegroup API gets used when
+    # calling this API.
+    def test_services_with_exception(self):
+        def dummy_is_up(self, dummy):
+            raise KeyError()
+
+        self.stubs.Set(db_driver.DbDriver, 'is_up', dummy_is_up)
+        req = FakeRequestWithHostService()
+        self.assertRaises(KeyError, self.controller.index, req)
diff --git a/nova/tests/api/openstack/compute/contrib/test_volumes.py b/nova/tests/api/openstack/compute/contrib/test_volumes.py
index d1d7210f0..5e331f4f4 100644
--- a/nova/tests/api/openstack/compute/contrib/test_volumes.py
+++ b/nova/tests/api/openstack/compute/contrib/test_volumes.py
@@ -50,39 +50,49 @@ def fake_compute_api_create(cls, context, instance_type, image_href, **kwargs):
     inst_type = flavors.get_instance_type_by_flavor_id(2)
     resv_id = None
     return ([{'id': 1,
-             'display_name': 'test_server',
-             'uuid': FAKE_UUID,
-             'instance_type': dict(inst_type),
-             'access_ip_v4': '1.2.3.4',
-             'access_ip_v6': 'fead::1234',
-             'image_ref': IMAGE_UUID,
-             'user_id': 'fake',
-             'project_id': 'fake',
-             'created_at': datetime.datetime(2010, 10, 10, 12, 0, 0),
-             'updated_at': datetime.datetime(2010, 11, 11, 11, 0, 0),
-             'progress': 0,
-             'fixed_ips': []
-             }], resv_id)
+              'display_name': 'test_server',
+              'uuid': FAKE_UUID,
+              'instance_type': dict(inst_type),
+              'access_ip_v4': '1.2.3.4',
+              'access_ip_v6': 'fead::1234',
+              'image_ref': IMAGE_UUID,
+              'user_id': 'fake',
+              'project_id': 'fake',
+              'created_at': datetime.datetime(2010, 10, 10, 12, 0, 0),
+              'updated_at': datetime.datetime(2010, 11, 11, 11, 0, 0),
+              'progress': 0,
+              'fixed_ips': []
+              }], resv_id)
 
 
 def fake_get_instance(self, context, instance_id):
-    return({'uuid': instance_id})
+    return {'uuid': instance_id}
 
 
 def fake_get_volume(self, context, id):
-    return({'id': 'woot'})
+    return {'id': 'woot'}
 
 
 def fake_attach_volume(self, context, instance, volume_id, device):
-    return()
+    pass
 
 
 def fake_detach_volume(self, context, instance, volume):
-    return()
+    pass
+
+
+def fake_create_snapshot(self, context, volume, name, description):
+    return {'id': 123,
+            'volume_id': 'fakeVolId',
+            'status': 'available',
+            'volume_size': 123,
+            'created_at': '2013-01-01 00:00:01',
+            'display_name': 'myVolumeName',
+            'display_description': 'myVolumeDescription'}
 
 
 def fake_get_instance_bdms(self, context, instance):
-    return([{'id': 1,
+    return [{'id': 1,
              'instance_uuid': instance['uuid'],
              'device_name': '/dev/fake0',
              'delete_on_termination': 'False',
@@ -97,7 +107,7 @@ def fake_get_instance_bdms(self, context, instance):
              'virtual_name': 'MyNamesVirtual',
              'snapshot_id': None,
              'volume_id': FAKE_UUID_B,
-             'volume_size': 1}])
+             'volume_size': 1}]
 
 
 class BootFromVolumeTest(test.TestCase):
@@ -668,3 +678,29 @@ class UnprocessableSnapshotTestCase(CommonUnprocessableEntityTestCase,
     resource = 'os-snapshots'
     entity_name = 'snapshot'
     controller_cls = volumes.SnapshotController
+
+
+class CreateSnapshotTestCase(test.TestCase):
+    def setUp(self):
+        super(CreateSnapshotTestCase, self).setUp()
+        self.controller = volumes.SnapshotController()
+        self.stubs.Set(cinder.API, 'get', fake_get_volume)
+        self.stubs.Set(cinder.API, 'create_snapshot_force',
+                       fake_create_snapshot)
+        self.stubs.Set(cinder.API, 'create_snapshot', fake_create_snapshot)
+        self.req = fakes.HTTPRequest.blank('/v2/fake/os-snapshots')
+        self.req.method = 'POST'
+        self.body = {'snapshot': {'volume_id': 1}}
+
+    def test_force_true(self):
+        self.body['snapshot']['force'] = 'True'
+        self.controller.create(self.req, body=self.body)
+
+    def test_force_false(self):
+        self.body['snapshot']['force'] = 'f'
+        self.controller.create(self.req, body=self.body)
+
+    def test_force_invalid(self):
+        self.body['snapshot']['force'] = 'foo'
+        self.assertRaises(exception.InvalidParameterValue,
+                          self.controller.create, self.req, body=self.body)
diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py
index 5d2118564..993451263 100644
--- a/nova/tests/api/openstack/compute/test_servers.py
+++ b/nova/tests/api/openstack/compute/test_servers.py
@@ -935,10 +935,10 @@ class ServersControllerTest(test.TestCase):
             self.assertNotEqual(search_opts, None)
             # Allowed by user
             self.assertTrue('name' in search_opts)
+            self.assertTrue('ip' in search_opts)
             # OSAPI converts status to vm_state
             self.assertTrue('vm_state' in search_opts)
             # Allowed only by admins with admin API on
-            self.assertFalse('ip' in search_opts)
             self.assertFalse('unknown_option' in search_opts)
             return [fakes.stub_instance(100, uuid=server_uuid)]
 
@@ -981,10 +981,8 @@ class ServersControllerTest(test.TestCase):
         self.assertEqual(len(servers), 1)
         self.assertEqual(servers[0]['id'], server_uuid)
 
-    def test_get_servers_admin_allows_ip(self):
-        """Test getting servers by ip with admin_api enabled and
-        admin context
-        """
+    def test_get_servers_allows_ip(self):
+        """Test getting servers by ip."""
         server_uuid = str(uuid.uuid4())
 
         def fake_get_all(compute_self, context, search_opts=None,
@@ -997,8 +995,7 @@ class ServersControllerTest(test.TestCase):
 
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?ip=10\..*',
-                                      use_admin_context=True)
+        req = fakes.HTTPRequest.blank('/v2/fake/servers?ip=10\..*')
         servers = self.controller.index(req)['servers']
 
         self.assertEqual(len(servers), 1)
@@ -1405,8 +1402,9 @@ class ServersControllerTest(test.TestCase):
                 name='public image', is_public=True,
                 status='active', properties={'key1': 'value1'},
                 min_ram="4096", min_disk="10")
-        self.stubs.Set(compute_api.API, '_get_image',
-                fake_get_image)
+
+        self.stubs.Set(fake._FakeImageService, 'show', fake_get_image)
+
         self.stubs.Set(db, 'instance_get_by_uuid',
                 fakes.fake_instance_get(vm_state=vm_states.ACTIVE))
         image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
@@ -1432,8 +1430,35 @@ class ServersControllerTest(test.TestCase):
                 name='public image', is_public=True,
                 status='active', properties={'key1': 'value1'},
                 min_ram="128", min_disk="100000")
-        self.stubs.Set(compute_api.API, '_get_image',
-                fake_get_image)
+
+        self.stubs.Set(fake._FakeImageService, 'show', fake_get_image)
+
+        self.stubs.Set(db, 'instance_get_by_uuid',
+                fakes.fake_instance_get(vm_state=vm_states.ACTIVE))
+        image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
+        image_href = 'http://localhost/v2/fake/images/%s' % image_uuid
+        body = {
+            'rebuild': {
+                'name': 'new_name',
+                'imageRef': image_href,
+            },
+        }
+
+        req = fakes.HTTPRequest.blank('/v2/fake/servers/a/action')
+        req.method = 'POST'
+        req.body = jsonutils.dumps(body)
+        req.headers["content-type"] = "application/json"
+        self.assertRaises(webob.exc.HTTPBadRequest,
+            self.controller._action_rebuild, req, FAKE_UUID, body)
+
+    def test_rebuild_instance_with_deleted_image(self):
+        def fake_get_image(self, context, image_href):
+            return dict(id='76fa36fc-c930-4bf3-8c8a-ea2a2420deb6',
+                        name='public image', is_public=True,
+                        status='DELETED')
+
+        self.stubs.Set(fake._FakeImageService, 'show', fake_get_image)
+
         self.stubs.Set(db, 'instance_get_by_uuid',
                 fakes.fake_instance_get(vm_state=vm_states.ACTIVE))
         image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
diff --git a/nova/tests/cells/test_cells_messaging.py b/nova/tests/cells/test_cells_messaging.py
index 51a792975..1de39de1f 100644
--- a/nova/tests/cells/test_cells_messaging.py
+++ b/nova/tests/cells/test_cells_messaging.py
@@ -1033,8 +1033,7 @@ class CellsBroadcastMethodsTestCase(test.TestCase):
                                          expected_instance,
                                          update_cells=False)
         self.tgt_db_inst.instance_info_cache_update(self.ctxt, 'fake_uuid',
-                                                    expected_info_cache,
-                                                    update_cells=False)
+                                                    expected_info_cache)
         self.mox.ReplayAll()
 
         self.src_msg_runner.instance_update_at_top(self.ctxt, fake_instance)
@@ -1086,8 +1085,7 @@ class CellsBroadcastMethodsTestCase(test.TestCase):
                                          expected_instance,
                                          update_cells=False)
         self.tgt_db_inst.instance_info_cache_update(self.ctxt, 'fake_uuid',
-                                                    expected_info_cache,
-                                                    update_cells=False)
+                                                    expected_info_cache)
         self.mox.ReplayAll()
 
         self.src_msg_runner.instance_update_at_top(self.ctxt, fake_instance)
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index cef9d2cb3..933d40d59 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -135,7 +135,7 @@ class BaseTestCase(test.TestCase):
                                    'memory_mb': 131072,
                                    'current_workload': 0,
                                    'vcpus': 16,
-                                   'cpu_info':'ppc64,powervm,3940',
+                                   'cpu_info': 'ppc64,powervm,3940',
                                    'running_vms': 0,
                                    'free_disk_gb': 259,
                                    'service_id': 7,
@@ -3493,6 +3493,7 @@ class ComputeTestCase(BaseTestCase):
         self.compute.driver.ensure_filtering_rules_for_instance(
             mox.IsA(instance), nw_info)
 
+        test_notifier.NOTIFICATIONS = []
         # start test
         self.mox.ReplayAll()
         migrate_data = {'is_shared_storage': False}
@@ -3500,6 +3501,13 @@ class ComputeTestCase(BaseTestCase):
                                               block_migration=False,
                                               migrate_data=migrate_data)
         self.assertEqual(ret, None)
+        self.assertEqual(len(test_notifier.NOTIFICATIONS), 2)
+        msg = test_notifier.NOTIFICATIONS[0]
+        self.assertEqual(msg['event_type'],
+                         'compute.instance.live_migration.pre.start')
+        msg = test_notifier.NOTIFICATIONS[1]
+        self.assertEqual(msg['event_type'],
+                         'compute.instance.live_migration.pre.end')
 
         # cleanup
         db.instance_destroy(c, instance['uuid'])
@@ -3719,11 +3727,20 @@ class ComputeTestCase(BaseTestCase):
         self.compute.network_api.setup_networks_on_host(self.admin_ctxt,
                 mox.IgnoreArg(), self.compute.host)
 
+        test_notifier.NOTIFICATIONS = []
         self.mox.ReplayAll()
 
         self.compute.post_live_migration_at_destination(self.admin_ctxt,
                                                         self.instance)
 
+        self.assertEqual(len(test_notifier.NOTIFICATIONS), 2)
+        msg = test_notifier.NOTIFICATIONS[0]
+        self.assertEqual(msg['event_type'],
+                         'compute.instance.live_migration.post.dest.start')
+        msg = test_notifier.NOTIFICATIONS[1]
+        self.assertEqual(msg['event_type'],
+                         'compute.instance.live_migration.post.dest.end')
+
         return self.compute.conductor_api.instance_get_by_uuid(self.admin_ctxt,
                                                         self.instance['uuid'])
 
@@ -3749,6 +3766,31 @@ class ComputeTestCase(BaseTestCase):
         updated = self._finish_post_live_migration_at_destination()
         self.assertIsNone(updated['node'])
 
+    def test_rollback_live_migration_at_destination_correctly(self):
+        # creating instance testdata
+        c = context.get_admin_context()
+        instance_ref = self._create_fake_instance({'host': 'dummy'})
+        inst_uuid = instance_ref['uuid']
+        inst_id = instance_ref['id']
+
+        instance = jsonutils.to_primitive(db.instance_get(c, inst_id))
+        test_notifier.NOTIFICATIONS = []
+        # start test
+        self.mox.ReplayAll()
+        ret = self.compute.rollback_live_migration_at_destination(c,
+                                          instance=instance)
+        self.assertEqual(ret, None)
+        self.assertEqual(len(test_notifier.NOTIFICATIONS), 2)
+        msg = test_notifier.NOTIFICATIONS[0]
+        self.assertEqual(msg['event_type'],
+                       'compute.instance.live_migration.rollback.dest.start')
+        msg = test_notifier.NOTIFICATIONS[1]
+        self.assertEqual(msg['event_type'],
+                        'compute.instance.live_migration.rollback.dest.end')
+
+        # cleanup
+        db.instance_destroy(c, inst_uuid)
+
     def test_run_kill_vm(self):
         # Detect when a vm is terminated behind the scenes.
         self.stubs.Set(compute_manager.ComputeManager,
@@ -3888,13 +3930,15 @@ class ComputeTestCase(BaseTestCase):
         deleted_at = (timeutils.utcnow() -
                       datetime.timedelta(hours=1, minutes=5))
         instance = self._create_fake_instance({"deleted_at": deleted_at,
-                                          "deleted": True})
+                                               "deleted": True})
 
         self.compute.host = instance['host']
 
         self.mox.StubOutWithMock(self.compute, '_get_instances_on_driver')
-        self.compute._get_instances_on_driver(admin_context).AndReturn(
-                [instance])
+        self.compute._get_instances_on_driver(
+            admin_context, {'deleted': True,
+                            'soft_deleted': False,
+                            'host': self.compute.host}).AndReturn([instance])
         self.flags(running_deleted_instance_timeout=3600,
                    running_deleted_instance_action='reap')
 
@@ -3922,13 +3966,11 @@ class ComputeTestCase(BaseTestCase):
         instance1['deleted'] = True
         instance1['deleted_at'] = "sometimeago"
 
-        instance2 = {}
-        instance2['deleted'] = False
-        instance2['deleted_at'] = None
-
         self.mox.StubOutWithMock(self.compute, '_get_instances_on_driver')
-        self.compute._get_instances_on_driver(admin_context).AndReturn(
-                [instance1, instance2])
+        self.compute._get_instances_on_driver(
+            admin_context, {'deleted': True,
+                            'soft_deleted': False,
+                            'host': self.compute.host}).AndReturn([instance1])
 
         self.mox.StubOutWithMock(timeutils, 'is_older_than')
         timeutils.is_older_than('sometimeago',
@@ -4046,25 +4088,23 @@ class ComputeTestCase(BaseTestCase):
 
         instances = [{'uuid': 'fake_uuid1', 'vm_state': vm_states.RESCUED,
                       'launched_at': timed_out_time},
-                     {'uuid': 'fake_uuid2', 'vm_state': vm_states.ACTIVE,
-                      'launched_at': timed_out_time},
-                     {'uuid': 'fake_uuid3', 'vm_state': vm_states.ACTIVE,
-                      'launched_at': not_timed_out_time},
-                     {'uuid': 'fake_uuid4', 'vm_state': vm_states.RESCUED,
+                     {'uuid': 'fake_uuid2', 'vm_state': vm_states.RESCUED,
                       'launched_at': timed_out_time},
-                     {'uuid': 'fake_uuid5', 'vm_state': vm_states.RESCUED,
+                     {'uuid': 'fake_uuid3', 'vm_state': vm_states.RESCUED,
                       'launched_at': not_timed_out_time}]
-        unrescued_instances = {'fake_uuid1': False, 'fake_uuid4': False}
+        unrescued_instances = {'fake_uuid1': False, 'fake_uuid2': False}
 
-        def fake_instance_get_all_by_host(context, host, columns_to_join):
+        def fake_instance_get_all_by_filters(context, filters,
+                                             columns_to_join):
             self.assertEqual(columns_to_join, [])
             return instances
 
         def fake_unrescue(context, instance):
             unrescued_instances[instance['uuid']] = True
 
-        self.stubs.Set(self.compute.conductor_api, 'instance_get_all_by_host',
-                       fake_instance_get_all_by_host)
+        self.stubs.Set(self.compute.conductor_api,
+                       'instance_get_all_by_filters',
+                       fake_instance_get_all_by_filters)
         self.stubs.Set(self.compute.conductor_api, 'compute_unrescue',
                        fake_unrescue)
 
@@ -4315,8 +4355,8 @@ class ComputeTestCase(BaseTestCase):
         self.mox.StubOutWithMock(self.compute, '_legacy_nw_info')
         self.mox.StubOutWithMock(self.compute.driver, 'destroy')
 
-        self.compute._get_instances_on_driver(fake_context).AndReturn(
-                instances)
+        self.compute._get_instances_on_driver(
+                fake_context, {'deleted': False}).AndReturn(instances)
         self.compute._get_instance_nw_info(fake_context,
                                            evacuated_instance).AndReturn(
                                                    'fake_network_info')
@@ -4368,8 +4408,8 @@ class ComputeTestCase(BaseTestCase):
         self.mox.StubOutWithMock(self.compute, '_legacy_nw_info')
         self.mox.StubOutWithMock(self.compute.driver, 'destroy')
 
-        self.compute._get_instances_on_driver(fake_context).AndReturn(
-                instances)
+        self.compute._get_instances_on_driver(
+                fake_context, {'deleted': False}).AndReturn(instances)
         self.compute._get_instance_nw_info(fake_context,
                                            evacuated_instance).AndReturn(
                                                    'fake_network_info')
@@ -4426,8 +4466,8 @@ class ComputeTestCase(BaseTestCase):
         self.mox.StubOutWithMock(self.compute, '_legacy_nw_info')
         self.mox.StubOutWithMock(self.compute.driver, 'destroy')
 
-        self.compute._get_instances_on_driver(fake_context).AndReturn(
-                instances)
+        self.compute._get_instances_on_driver(
+                fake_context, {'deleted': False}).AndReturn(instances)
         self.compute._get_instance_nw_info(fake_context,
                                            evacuated_instance).AndReturn(
                                                    'fake_network_info')
@@ -4533,8 +4573,8 @@ class ComputeTestCase(BaseTestCase):
         self.compute.init_virt_events()
 
         # simulate failed instance
-        self.compute._get_instances_on_driver(fake_context).AndReturn([
-            deleted_instance])
+        self.compute._get_instances_on_driver(
+            fake_context, {'deleted': False}).AndReturn([deleted_instance])
         self.compute._get_instance_nw_info(fake_context, deleted_instance
             ).AndRaise(exception.InstanceNotFound(
                 instance_id=deleted_instance['uuid']))
@@ -4693,6 +4733,7 @@ class ComputeTestCase(BaseTestCase):
         # Test getting instances when driver doesn't support
         # 'list_instance_uuids'
         self.compute.host = 'host'
+        filters = {'host': self.compute.host}
         fake_context = context.get_admin_context()
 
         all_instances = []
@@ -4708,19 +4749,19 @@ class ComputeTestCase(BaseTestCase):
         self.mox.StubOutWithMock(self.compute.driver,
                 'list_instances')
         self.mox.StubOutWithMock(self.compute.conductor_api,
-                'instance_get_all_by_host')
+                'instance_get_all_by_filters')
 
         self.compute.driver.list_instance_uuids().AndRaise(
                 NotImplementedError())
         self.compute.driver.list_instances().AndReturn(
                 [inst['name'] for inst in driver_instances])
-        self.compute.conductor_api.instance_get_all_by_host(
-                fake_context, self.compute.host,
+        self.compute.conductor_api.instance_get_all_by_filters(
+                fake_context, filters,
                 columns_to_join=[]).AndReturn(all_instances)
 
         self.mox.ReplayAll()
 
-        result = self.compute._get_instances_on_driver(fake_context)
+        result = self.compute._get_instances_on_driver(fake_context, filters)
         self.assertEqual(driver_instances, result)
 
     def test_instance_usage_audit(self):
@@ -5502,6 +5543,105 @@ class ComputeAPITestCase(BaseTestCase):
         instance = db.instance_get_by_uuid(self.context, instance_uuid)
         self.assertEqual(instance['task_state'], task_states.REBUILDING)
 
+    def test_rebuild_with_deleted_image(self):
+        # If we're given a deleted image by glance, we should not be able to
+        # rebuild from it
+        instance = jsonutils.to_primitive(
+            self._create_fake_instance(params={'image_ref': '1'}))
+
+        self.fake_image['name'] = 'fake_name'
+        self.fake_image['status'] = 'DELETED'
+        self.stubs.Set(fake_image._FakeImageService, 'show', self.fake_show)
+
+        expected_message = (
+            exception.ImageNotActive.message % {'image_id':
+            self.fake_image['id']})
+        with testtools.ExpectedException(exception.ImageNotActive,
+                                         expected_message):
+            self.compute_api.rebuild(self.context, instance,
+                                     self.fake_image['id'], 'new_password')
+
+    def test_rebuild_with_too_little_ram(self):
+        instance = jsonutils.to_primitive(
+            self._create_fake_instance(params={'image_ref': '1'}))
+
+        def fake_extract_instance_type(_inst):
+            return dict(memory_mb=64, root_gb=1)
+
+        self.stubs.Set(flavors, 'extract_instance_type',
+                       fake_extract_instance_type)
+
+        self.fake_image['min_ram'] = 128
+        self.stubs.Set(fake_image._FakeImageService, 'show', self.fake_show)
+
+        self.assertRaises(exception.InstanceTypeMemoryTooSmall,
+            self.compute_api.rebuild, self.context,
+            instance, self.fake_image['id'], 'new_password')
+
+        # Reduce image memory requirements and make sure it works
+        self.fake_image['min_ram'] = 64
+
+        self.compute_api.rebuild(self.context,
+                instance, self.fake_image['id'], 'new_password')
+        db.instance_destroy(self.context, instance['uuid'])
+
+    def test_rebuild_with_too_little_disk(self):
+        instance = jsonutils.to_primitive(
+            self._create_fake_instance(params={'image_ref': '1'}))
+
+        def fake_extract_instance_type(_inst):
+            return dict(memory_mb=64, root_gb=1)
+
+        self.stubs.Set(flavors, 'extract_instance_type',
+                       fake_extract_instance_type)
+
+        self.fake_image['min_disk'] = 2
+        self.stubs.Set(fake_image._FakeImageService, 'show', self.fake_show)
+
+        self.assertRaises(exception.InstanceTypeDiskTooSmall,
+            self.compute_api.rebuild, self.context,
+            instance, self.fake_image['id'], 'new_password')
+
+        # Reduce image disk requirements and make sure it works
+        self.fake_image['min_disk'] = 1
+
+        self.compute_api.rebuild(self.context,
+                instance, self.fake_image['id'], 'new_password')
+        db.instance_destroy(self.context, instance['uuid'])
+
+    def test_rebuild_with_just_enough_ram_and_disk(self):
+        instance = jsonutils.to_primitive(
+            self._create_fake_instance(params={'image_ref': '1'}))
+
+        def fake_extract_instance_type(_inst):
+            return dict(memory_mb=64, root_gb=1)
+
+        self.stubs.Set(flavors, 'extract_instance_type',
+                       fake_extract_instance_type)
+
+        self.fake_image['min_ram'] = 64
+        self.fake_image['min_disk'] = 1
+        self.stubs.Set(fake_image._FakeImageService, 'show', self.fake_show)
+
+        self.compute_api.rebuild(self.context,
+                instance, self.fake_image['id'], 'new_password')
+        db.instance_destroy(self.context, instance['uuid'])
+
+    def test_rebuild_with_no_ram_and_disk_reqs(self):
+        instance = jsonutils.to_primitive(
+            self._create_fake_instance(params={'image_ref': '1'}))
+
+        def fake_extract_instance_type(_inst):
+            return dict(memory_mb=64, root_gb=1)
+
+        self.stubs.Set(flavors, 'extract_instance_type',
+                       fake_extract_instance_type)
+        self.stubs.Set(fake_image._FakeImageService, 'show', self.fake_show)
+
+        self.compute_api.rebuild(self.context,
+                instance, self.fake_image['id'], 'new_password')
+        db.instance_destroy(self.context, instance['uuid'])
+
     def _stub_out_reboot(self, device_name):
         def fake_reboot_instance(rpcapi, context, instance,
                                  block_device_info,
@@ -5706,7 +5846,7 @@ class ComputeAPITestCase(BaseTestCase):
 
         def fake_get_instance_bdms(*args, **kwargs):
             return [{'device_name': '/dev/vda',
-                     'volume_id':'bf0b6b00-a20c-11e2-9e96-0800200c9a66'}]
+                     'volume_id': 'bf0b6b00-a20c-11e2-9e96-0800200c9a66'}]
 
         self.stubs.Set(self.compute_api, 'get_instance_bdms',
                        fake_get_instance_bdms)
@@ -6156,6 +6296,22 @@ class ComputeAPITestCase(BaseTestCase):
                           self.context, instance)
         self.compute.terminate_instance(self.context, instance=instance)
 
+    def test_resize_no_image(self):
+        def _fake_prep_resize(_context, **args):
+            image = args['image']
+            self.assertEqual(image, {})
+
+        instance = self._create_fake_instance(params={'image_ref': ''})
+        instance = db.instance_get_by_uuid(self.context, instance['uuid'])
+        instance = jsonutils.to_primitive(instance)
+        self.compute.run_instance(self.context, instance=instance)
+
+        self.stubs.Set(self.compute_api.scheduler_rpcapi,
+                       'prep_resize', _fake_prep_resize)
+
+        self.compute_api.resize(self.context, instance, None)
+        self.compute.terminate_instance(self.context, instance=instance)
+
     def test_migrate(self):
         instance = self._create_fake_instance()
         instance = db.instance_get_by_uuid(self.context, instance['uuid'])
@@ -6964,7 +7120,7 @@ class ComputeAPITestCase(BaseTestCase):
 
         def fake_get_instance_bdms(*args, **kwargs):
             return [{'device_name': '/dev/vda',
-                     'volume_id':'bf0b6b00-a20c-11e2-9e96-0800200c9a66'}]
+                     'volume_id': 'bf0b6b00-a20c-11e2-9e96-0800200c9a66'}]
 
         self.stubs.Set(self.compute_api, 'get_instance_bdms',
                        fake_get_instance_bdms)
@@ -8752,3 +8908,155 @@ class ComputeInjectedFilesTestCase(BaseTestCase):
 
         self.compute.run_instance(self.context, self.instance,
                                   injected_files=expected)
+
+
+class GetAndCheckImageMetadataTest(test.TestCase):
+    NOT_PRESENT = object()
+
+    def setUp(self):
+        super(GetAndCheckImageMetadataTest, self).setUp()
+        self.context = context.RequestContext('fakeuser', 'fakeproject')
+        self.compute = importutils.import_object(CONF.compute_manager)
+
+    def assertCheckSucceedsWithWonkySize(self, size):
+        instance = {'uuid': 'fakeuuid', 'image_ref': 'fakeimage'}
+        image_meta = {'id': 'imageid'}
+        if size is not self.NOT_PRESENT:
+            image_meta['size'] = size
+
+        self.mox.StubOutWithMock(compute_manager, '_get_image_meta')
+        compute_manager._get_image_meta(self.context,
+                instance['image_ref']).AndReturn(image_meta)
+
+        self.mox.ReplayAll()
+
+        image_meta2 = self.compute._get_and_check_image_metadata(
+                self.context, instance)
+
+        self.assertEqual(image_meta, image_meta2)
+
+    def test_size_not_present_on_image(self):
+        self.assertCheckSucceedsWithWonkySize(self.NOT_PRESENT)
+
+    def test_invalid_image_size(self):
+        self.assertCheckSucceedsWithWonkySize('invalid')
+
+    def test_image_size_present_but_empty(self):
+        self.assertCheckSucceedsWithWonkySize('')
+
+    def test_image_size_is_none(self):
+        self.assertCheckSucceedsWithWonkySize(None)
+
+    def test_root_gb_zero(self):
+        instance = {'uuid': 'fakeuuid', 'image_ref': 'fakeimage'}
+        self.mox.StubOutWithMock(flavors, 'extract_instance_type')
+        flavors.extract_instance_type(instance).AndReturn({'root_gb': 0})
+
+        self.mox.StubOutWithMock(compute_manager, '_get_image_meta')
+
+        image_meta = {'id': 'imageid', 'size': '123'}
+        compute_manager._get_image_meta(self.context,
+                instance['image_ref']).AndReturn(image_meta)
+
+        self.mox.ReplayAll()
+
+        image_meta2 = self.compute._get_and_check_image_metadata(
+                self.context, instance)
+
+        self.assertEqual(image_meta, image_meta2)
+
+    def test_image_ref_is_none(self):
+        # Instance was started from volume - so no image ref
+        instance = {'uuid': 'fakeuuid', 'image_ref': None}
+        image_meta2 = self.compute._get_and_check_image_metadata(
+                self.context, instance)
+
+        self.assertEqual({}, image_meta2)
+
+    def test_image_not_too_large(self):
+        instance = {'uuid': 'fakeuuid', 'image_ref': 'fakeimage'}
+
+        self.mox.StubOutWithMock(flavors, 'extract_instance_type')
+        flavors.extract_instance_type(instance).AndReturn({'root_gb': 1})
+
+        image_meta = {'id': 'imageid', 'size': '1073741824'}
+        self.mox.StubOutWithMock(compute_manager, '_get_image_meta')
+        compute_manager._get_image_meta(self.context,
+                instance['image_ref']).AndReturn(image_meta)
+
+        self.mox.ReplayAll()
+
+        image_meta2 = self.compute._get_and_check_image_metadata(
+                self.context, instance)
+
+        self.assertEqual(image_meta, image_meta2)
+
+    def test_image_too_large(self):
+        instance = {'uuid': 'fakeuuid', 'image_ref': 'fakeimage'}
+
+        self.mox.StubOutWithMock(flavors, 'extract_instance_type')
+        flavors.extract_instance_type(instance).AndReturn({'root_gb': 1})
+
+        image_meta = {'id': 'imageid', 'size': '1073741825'}
+        self.mox.StubOutWithMock(compute_manager, '_get_image_meta')
+        compute_manager._get_image_meta(self.context,
+                instance['image_ref']).AndReturn(image_meta)
+
+        self.mox.ReplayAll()
+
+        self.assertRaises(exception.ImageTooLarge,
+                self.compute._get_and_check_image_metadata,
+                self.context, instance)
+
+
+class CheckConfigDriveTestCase(test.TestCase):
+    # NOTE(sirp): `TestCase` is far too heavyweight for this test, this should
+    # probably derive from a `test.FastTestCase` that omits DB and env
+    # handling
+    def setUp(self):
+        super(CheckConfigDriveTestCase, self).setUp()
+        self.compute_api = compute.API()
+        self.context = context.RequestContext(
+                'fake_user_id', 'fake_project_id')
+
+        self.called = called = {'show': False}
+
+        def fake_get_remote_image_service(context, image_id):
+            class FakeGlance(object):
+                def show(self, context, image_id):
+                    called['show'] = True
+
+            return FakeGlance(), image_id
+
+        self.stubs.Set(glance, 'get_remote_image_service',
+                       fake_get_remote_image_service)
+
+    def tearDown(self):
+        self.stubs.UnsetAll()
+        super(CheckConfigDriveTestCase, self).tearDown()
+
+    def assertCheck(self, expected, config_drive):
+        self.assertEqual(expected,
+                         self.compute_api._check_config_drive(
+                             self.context, config_drive))
+
+    def test_value_is_none(self):
+        self.assertFalse(self.called['show'])
+        self.assertCheck((None, None), None)
+        self.assertFalse(self.called['show'])
+
+    def test_value_is_bool_like_string(self):
+        self.assertCheck((None, 'True'), 'True')
+        self.assertCheck((None, 'yes'), 'yes')
+
+    def test_bool_string_or_id(self):
+        # NOTE(sirp): '0' and '1' could be a bool value or an ID.  Since there
+        # are many other ways to specify bools (e.g. 't', 'f'), it's better to
+        # treat as an ID.
+        self.assertCheck((0, None), 0)
+        self.assertCheck((1, None), 1)
+        self.assertCheck(('0', None), '0')
+        self.assertCheck(('1', None), '1')
+
+    def test_value_is_image_id(self):
+        self.assertCheck((2, None), 2)
diff --git a/nova/tests/compute/test_compute_cells.py b/nova/tests/compute/test_compute_cells.py
index 40ae4e3de..ad4e6c754 100644
--- a/nova/tests/compute/test_compute_cells.py
+++ b/nova/tests/compute/test_compute_cells.py
@@ -145,9 +145,6 @@ class CellsComputeAPITestCase(test_compute.ComputeAPITestCase):
     def test_instance_metadata(self):
         self.skipTest("Test is incompatible with cells.")
 
-    def test_live_migrate(self):
-        self.skipTest("Test is incompatible with cells.")
-
     def test_snapshot_given_image_uuid(self):
         self.skipTest("Test doesn't apply to API cell.")
 
diff --git a/nova/tests/compute/test_multiple_nodes.py b/nova/tests/compute/test_multiple_nodes.py
index c44d9974e..b9a17cefe 100644
--- a/nova/tests/compute/test_multiple_nodes.py
+++ b/nova/tests/compute/test_multiple_nodes.py
@@ -97,7 +97,7 @@ class MultiNodeComputeTestCase(BaseTestCase):
                                    'memory_mb': 131072,
                                    'current_workload': 0,
                                    'vcpus': 16,
-                                   'cpu_info':'ppc64,powervm,3940',
+                                   'cpu_info': 'ppc64,powervm,3940',
                                    'running_vms': 0,
                                    'free_disk_gb': 259,
                                    'service_id': 7,
diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py
index 3780fc7cf..3aebf76af 100644
--- a/nova/tests/conductor/test_conductor.py
+++ b/nova/tests/conductor/test_conductor.py
@@ -318,12 +318,6 @@ class _BaseTestCase(object):
             self.context, fake_inst)
         self.assertEqual(result, 'fake-result')
 
-    def test_instance_get_all_hung_in_rebooting(self):
-        self.mox.StubOutWithMock(db, 'instance_get_all_hung_in_rebooting')
-        db.instance_get_all_hung_in_rebooting(self.context, 123)
-        self.mox.ReplayAll()
-        self.conductor.instance_get_all_hung_in_rebooting(self.context, 123)
-
     def test_instance_get_active_by_window_joined(self):
         self.mox.StubOutWithMock(db, 'instance_get_active_by_window_joined')
         db.instance_get_active_by_window_joined(self.context, 'fake-begin',
@@ -952,18 +946,6 @@ class ConductorAPITestCase(_BaseTestCase, test.TestCase):
         self.conductor.block_device_mapping_destroy_by_instance_and_volume(
             self.context, fake_inst, 'fake-volume')
 
-    def test_instance_get_all(self):
-        self.mox.StubOutWithMock(db, 'instance_get_all_by_filters')
-        db.instance_get_all(self.context)
-        db.instance_get_all_by_filters(self.context, {'name': 'fake-inst'},
-                                       'updated_at', 'asc',
-                                       columns_to_join=None)
-        self.mox.ReplayAll()
-        self.conductor.instance_get_all(self.context)
-        self.conductor.instance_get_all_by_filters(self.context,
-                                                   {'name': 'fake-inst'},
-                                                   'updated_at', 'asc')
-
     def _test_stubbed(self, name, *args, **kwargs):
         if args and isinstance(args[0], FakeContext):
             ctxt = args[0]
diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl
index d1f78c08e..04083d063 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl
@@ -2,7 +2,7 @@
     "flavors": [
         {
             "OS-FLV-DISABLED:disabled": false,
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl
index 8d992e42d..5d73195fa 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-DISABLED:disabled="False">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-DISABLED:disabled="False">
     <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/>
   </flavor>
diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl
index cf5fb232a..a47af7b18 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl
@@ -1,7 +1,7 @@
 {
     "flavor": {
         "OS-FLV-DISABLED:disabled": false,
-        "disk": 0,
+        "disk": 1,
         "id": "%(flavor_id)s",
         "links": [
             {
diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl
index c7bdd1ca8..13908e2ac 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="%(flavor_id)s" OS-FLV-DISABLED:disabled="False">
+<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="%(flavor_id)s" OS-FLV-DISABLED:disabled="False">
   <atom:link href="%(host)s/v2/openstack/flavors/%(flavor_id)s" rel="self"/>
   <atom:link href="%(host)s/openstack/flavors/%(flavor_id)s" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl
index 3422de9f5..b86db0a46 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl
@@ -1,7 +1,7 @@
 {
     "flavor": {
         "OS-FLV-EXT-DATA:ephemeral": 0,
-        "disk": 0,
+        "disk": 1,
         "id": "%(flavor_id)s",
         "links": [
             {
diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl
index dc143010a..da45536c3 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="%(flavor_name)s" id="%(flavor_id)s" OS-FLV-EXT-DATA:ephemeral="0">
+<flavor xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="%(flavor_name)s" id="%(flavor_id)s" OS-FLV-EXT-DATA:ephemeral="0">
   <atom:link href="%(host)s/v2/openstack/flavors/%(flavor_id)s" rel="self"/>
   <atom:link href="%(host)s/openstack/flavors/%(flavor_id)s" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl
index 2c79efeaf..a798262f3 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl
@@ -2,7 +2,7 @@
     "flavors": [
         {
             "OS-FLV-EXT-DATA:ephemeral": 0,
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl
index 7108ebd79..5ba463188 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-EXT-DATA:ephemeral="0">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-EXT-DATA:ephemeral="0">
     <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/>
   </flavor>
diff --git a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl b/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl
index bbd681e66..b68bc3c97 100644
--- a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl
@@ -2,7 +2,7 @@
     "flavor": {
         "OS-FLV-DISABLED:disabled": false,
         "OS-FLV-EXT-DATA:ephemeral": 0,
-        "disk": 0,
+        "disk": 1,
         "id": "1",
         "links": [
             {
@@ -21,4 +21,4 @@
         "swap": "",
         "vcpus": 1
     }
-}
\ No newline at end of file
+}
diff --git a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl
index 920b82e53..53f870ec4 100644
--- a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" swap="" rxtx_factor="1.0" disk="0" id="1" os-flavor-access:is_public="True" OS-FLV-EXT-DATA:ephemeral="0" OS-FLV-DISABLED:disabled="False">
+<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" swap="" rxtx_factor="1.0" disk="1" id="1" os-flavor-access:is_public="True" OS-FLV-EXT-DATA:ephemeral="0" OS-FLV-DISABLED:disabled="False">
   <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
   <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/flavor-get-resp.json.tpl b/nova/tests/integrated/api_samples/flavor-get-resp.json.tpl
index 86ff86fa1..723be2898 100644
--- a/nova/tests/integrated/api_samples/flavor-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/flavor-get-resp.json.tpl
@@ -1,6 +1,6 @@
 {
     "flavor": {
-        "disk": 0,
+        "disk": 1,
         "id": "1",
         "links": [
             {
diff --git a/nova/tests/integrated/api_samples/flavor-get-resp.xml.tpl b/nova/tests/integrated/api_samples/flavor-get-resp.xml.tpl
index ca49884f3..5925c588d 100644
--- a/nova/tests/integrated/api_samples/flavor-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/flavor-get-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" disk="0" id="1">
+<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" disk="1" id="1">
   <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
   <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/flavors-list-resp.json.tpl b/nova/tests/integrated/api_samples/flavors-list-resp.json.tpl
index ab86d2a52..fb9a8ff1f 100644
--- a/nova/tests/integrated/api_samples/flavors-list-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/flavors-list-resp.json.tpl
@@ -71,4 +71,4 @@
             "name": "m1.xlarge"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl
index 711207d2d..b5f1eea54 100644
--- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl
@@ -1,7 +1,7 @@
 {
     "flavors": [
         {
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl
index cdef74cce..8ee66226a 100644
--- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" os-flavor-access:is_public="True">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" os-flavor-access:is_public="True">
     <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/>
   </flavor>
diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl
index 975f38661..2e991a4ce 100644
--- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl
@@ -1,6 +1,6 @@
 {
     "flavor": {
-        "disk": 0,
+        "disk": 1,
         "id": "%(flavor_id)s",
         "links": [
             {
diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl
index f9a3ff178..ae18daba2 100644
--- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="%(flavor_id)s" os-flavor-access:is_public="True">
+<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="%(flavor_id)s" os-flavor-access:is_public="True">
   <atom:link href="%(host)s/v2/openstack/flavors/%(flavor_id)s" rel="self"/>
   <atom:link href="%(host)s/openstack/flavors/%(flavor_id)s" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl
index a7f3a1993..241cf7c80 100644
--- a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl
@@ -1,6 +1,6 @@
 {
     "flavor": {
-        "disk": 0,
+        "disk": 1,
         "id": "%(flavor_id)s",
         "links": [
             {
diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl
index 4feec740c..d461b443e 100644
--- a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
+<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
   <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/>
   <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl
index 5b27e1385..035c860c9 100644
--- a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl
@@ -1,7 +1,7 @@
 {
     "flavors": [
         {
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl
index fb2ee09e0..ee937b974 100644
--- a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
     <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/>
   </flavor>
diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl
index be9afe012..9b7e57c8a 100644
--- a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl
@@ -1,6 +1,6 @@
 {
     "flavor": {
-        "disk": 0,
+        "disk": 1,
         "id": "%(flavor_id)s",
         "links": [
             {
diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl
index 53afae086..9375b14b5 100644
--- a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="%(flavor_name)s" id="%(flavor_id)s" swap="">
+<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="%(flavor_name)s" id="%(flavor_id)s" swap="">
   <atom:link href="%(host)s/v2/openstack/flavors/%(flavor_id)s" rel="self"/>
   <atom:link href="%(host)s/openstack/flavors/%(flavor_id)s" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl
index c46a1695d..1367e75de 100644
--- a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl
@@ -1,7 +1,7 @@
 {
     "flavors": [
         {
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl
index ced8e1779..7c9c589be 100644
--- a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" swap="">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" swap="">
     <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/>
   </flavor>
diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl
index 68092f353..a12dd7157 100644
--- a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl
+++ b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl
@@ -6,7 +6,7 @@
                 "flavor": "m1.tiny",
                 "hours": 1.0,
                 "instance_id": "%(uuid)s",
-                "local_gb": 0,
+                "local_gb": 1,
                 "memory_mb": 512,
                 "name": "new-server-test",
                 "started_at": "%(timestamp)s",
@@ -20,7 +20,7 @@
         "stop": "%(timestamp)s",
         "tenant_id": "openstack",
         "total_hours": 1.0,
-        "total_local_gb_usage": 0.0,
+        "total_local_gb_usage": 1.0,
         "total_memory_mb_usage": 512.0,
         "total_vcpus_usage": 1.0
     }
diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl
index a8a065fa1..4a6882307 100644
--- a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <tenant_usage>
   <tenant_id>openstack</tenant_id>
-  <total_local_gb_usage>0.0</total_local_gb_usage>
+  <total_local_gb_usage>1.0</total_local_gb_usage>
   <total_vcpus_usage>1.0</total_vcpus_usage>
   <total_memory_mb_usage>512.0</total_memory_mb_usage>
   <total_hours>1.0</total_hours>
@@ -13,7 +13,7 @@
       <name>new-server-test</name>
       <hours>1.0</hours>
       <memory_mb>512</memory_mb>
-      <local_gb>0</local_gb>
+      <local_gb>1</local_gb>
       <vcpus>1</vcpus>
       <tenant_id>openstack</tenant_id>
       <flavor>m1.tiny</flavor>
diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl
index b33ccbfc2..082e6bc90 100644
--- a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl
+++ b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl
@@ -5,7 +5,7 @@
             "stop": "%(timestamp)s",
             "tenant_id": "openstack",
             "total_hours": 1.0,
-            "total_local_gb_usage": 0.0,
+            "total_local_gb_usage": 1.0,
             "total_memory_mb_usage": 512.0,
             "total_vcpus_usage": 1.0
         }
diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl
index 536e79738..4a2833da8 100644
--- a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl
@@ -2,7 +2,7 @@
 <tenant_usages>
   <tenant_usage>
     <tenant_id>openstack</tenant_id>
-    <total_local_gb_usage>0.0</total_local_gb_usage>
+    <total_local_gb_usage>1.0</total_local_gb_usage>
     <total_vcpus_usage>1.0</total_vcpus_usage>
     <total_memory_mb_usage>512.0</total_memory_mb_usage>
     <total_hours>1.0</total_hours>
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py
index e24f24189..9b678ddd3 100644
--- a/nova/tests/integrated/test_api_samples.py
+++ b/nova/tests/integrated/test_api_samples.py
@@ -52,12 +52,12 @@ from nova.tests.api.openstack.compute.contrib import test_fping
 from nova.tests.api.openstack.compute.contrib import test_networks
 from nova.tests.api.openstack.compute.contrib import test_services
 from nova.tests.api.openstack import fakes
-from nova.tests.baremetal.db import base as bm_db_base
 from nova.tests import fake_instance_actions
 from nova.tests import fake_network
 from nova.tests.image import fake
 from nova.tests.integrated import integrated_helpers
 from nova.tests import utils as test_utils
+from nova.tests.virt.baremetal.db import base as bm_db_base
 from nova import utils
 from nova.volume import cinder
 
@@ -435,7 +435,7 @@ class VersionsSampleJsonTest(ApiSampleTestBase):
     def test_versions_get(self):
         response = self._do_get('', strip_version=True)
         subs = self._get_regexes()
-        return self._verify_response('versions-get-resp', subs, response, 200)
+        self._verify_response('versions-get-resp', subs, response, 200)
 
 
 class VersionsSampleXmlTest(VersionsSampleJsonTest):
@@ -465,14 +465,14 @@ class ServersSampleJsonTest(ServersSampleBase):
         subs['id'] = uuid
         subs['hypervisor_hostname'] = r'[\w\.\-]+'
         subs['mac_addr'] = '(?:[a-f0-9]{2}:){5}[a-f0-9]{2}'
-        return self._verify_response('server-get-resp', subs, response, 200)
+        self._verify_response('server-get-resp', subs, response, 200)
 
     def test_servers_list(self):
         uuid = self._post_server()
         response = self._do_get('servers')
         subs = self._get_regexes()
         subs['id'] = uuid
-        return self._verify_response('servers-list-resp', subs, response, 200)
+        self._verify_response('servers-list-resp', subs, response, 200)
 
     def test_servers_details(self):
         uuid = self._post_server()
@@ -482,8 +482,7 @@ class ServersSampleJsonTest(ServersSampleBase):
         subs['id'] = uuid
         subs['hypervisor_hostname'] = r'[\w\.\-]+'
         subs['mac_addr'] = '(?:[a-f0-9]{2}:){5}[a-f0-9]{2}'
-        return self._verify_response('servers-details-resp', subs,
-                                     response, 200)
+        self._verify_response('servers-details-resp', subs, response, 200)
 
 
 class ServersSampleXmlTest(ServersSampleJsonTest):
@@ -515,7 +514,6 @@ class ServersMetadataJsonTest(ServersSampleBase):
                                 'server-metadata-all-req',
                                 subs)
         self._verify_response('server-metadata-all-resp', subs, response, 200)
-
         return uuid
 
     def generalize_subs(self, subs, vanilla_regexes):
@@ -525,7 +523,7 @@ class ServersMetadataJsonTest(ServersSampleBase):
     def test_metadata_put_all(self):
         # Test setting all metadata for a server.
         subs = {'value': 'Foo Value'}
-        return self._create_and_set(subs)
+        self._create_and_set(subs)
 
     def test_metadata_post_all(self):
         # Test updating all metadata for a server.
@@ -552,16 +550,14 @@ class ServersMetadataJsonTest(ServersSampleBase):
         response = self._do_put('servers/%s/metadata/foo' % uuid,
                                 'server-metadata-req',
                                 subs)
-        return self._verify_response('server-metadata-resp', subs,
-                                     response, 200)
+        self._verify_response('server-metadata-resp', subs, response, 200)
 
     def test_metadata_get(self):
         # Test getting an individual metadata item for a server.
         subs = {'value': 'Foo Value'}
         uuid = self._create_and_set(subs)
         response = self._do_get('servers/%s/metadata/foo' % uuid)
-        return self._verify_response('server-metadata-resp', subs,
-                                     response, 200)
+        self._verify_response('server-metadata-resp', subs, response, 200)
 
     def test_metadata_delete(self):
         # Test deleting an individual metadata item for a server.
@@ -582,15 +578,14 @@ class ServersIpsJsonTest(ServersSampleBase):
         uuid = self._post_server()
         response = self._do_get('servers/%s/ips' % uuid)
         subs = self._get_regexes()
-        return self._verify_response('server-ips-resp', subs, response, 200)
+        self._verify_response('server-ips-resp', subs, response, 200)
 
     def test_get_by_network(self):
         # Test getting a server's IP information by network id.
         uuid = self._post_server()
         response = self._do_get('servers/%s/ips/private' % uuid)
         subs = self._get_regexes()
-        return self._verify_response('server-ips-network-resp', subs,
-                                     response, 200)
+        self._verify_response('server-ips-network-resp', subs, response, 200)
 
 
 class ServersIpsXmlTest(ServersIpsJsonTest):
@@ -603,8 +598,7 @@ class ExtensionsSampleJsonTest(ApiSampleTestBase):
     def test_extensions_get(self):
         response = self._do_get('extensions')
         subs = self._get_regexes()
-        return self._verify_response('extensions-get-resp', subs,
-                                     response, 200)
+        self._verify_response('extensions-get-resp', subs, response, 200)
 
 
 class ExtensionsSampleXmlTest(ExtensionsSampleJsonTest):
@@ -616,12 +610,12 @@ class FlavorsSampleJsonTest(ApiSampleTestBase):
     def test_flavors_get(self):
         response = self._do_get('flavors/1')
         subs = self._get_regexes()
-        return self._verify_response('flavor-get-resp', subs, response, 200)
+        self._verify_response('flavor-get-resp', subs, response, 200)
 
     def test_flavors_list(self):
         response = self._do_get('flavors')
         subs = self._get_regexes()
-        return self._verify_response('flavors-list-resp', subs, response, 200)
+        self._verify_response('flavors-list-resp', subs, response, 200)
 
 
 class FlavorsSampleXmlTest(FlavorsSampleJsonTest):
@@ -634,34 +628,33 @@ class HostsSampleJsonTest(ApiSampleTestBase):
     def test_host_startup(self):
         response = self._do_get('os-hosts/%s/startup' % self.compute.host)
         subs = self._get_regexes()
-        return self._verify_response('host-get-startup', subs, response, 200)
+        self._verify_response('host-get-startup', subs, response, 200)
 
     def test_host_reboot(self):
         response = self._do_get('os-hosts/%s/reboot' % self.compute.host)
         subs = self._get_regexes()
-        return self._verify_response('host-get-reboot', subs, response, 200)
+        self._verify_response('host-get-reboot', subs, response, 200)
 
     def test_host_shutdown(self):
         response = self._do_get('os-hosts/%s/shutdown' % self.compute.host)
         subs = self._get_regexes()
-        return self._verify_response('host-get-shutdown', subs, response, 200)
+        self._verify_response('host-get-shutdown', subs, response, 200)
 
     def test_host_maintenance(self):
         response = self._do_put('os-hosts/%s' % self.compute.host,
                                 'host-put-maintenance-req', {})
         subs = self._get_regexes()
-        return self._verify_response('host-put-maintenance-resp', subs,
-                                     response, 200)
+        self._verify_response('host-put-maintenance-resp', subs, response, 200)
 
     def test_host_get(self):
         response = self._do_get('os-hosts/%s' % self.compute.host)
         subs = self._get_regexes()
-        return self._verify_response('host-get-resp', subs, response, 200)
+        self._verify_response('host-get-resp', subs, response, 200)
 
     def test_hosts_list(self):
         response = self._do_get('os-hosts')
         subs = self._get_regexes()
-        return self._verify_response('hosts-list-resp', subs, response, 200)
+        self._verify_response('hosts-list-resp', subs, response, 200)
 
 
 class HostsSampleXmlTest(HostsSampleJsonTest):
@@ -681,8 +674,7 @@ class ImagesSampleJsonTest(ApiSampleTestBase):
         # Get api sample of images get list request.
         response = self._do_get('images')
         subs = self._get_regexes()
-        return self._verify_response('images-list-get-resp', subs,
-                                     response, 200)
+        self._verify_response('images-list-get-resp', subs, response, 200)
 
     def test_image_get(self):
         # Get api sample of one single image details request.
@@ -690,14 +682,13 @@ class ImagesSampleJsonTest(ApiSampleTestBase):
         response = self._do_get('images/%s' % image_id)
         subs = self._get_regexes()
         subs['image_id'] = image_id
-        return self._verify_response('image-get-resp', subs, response, 200)
+        self._verify_response('image-get-resp', subs, response, 200)
 
     def test_images_details(self):
         # Get api sample of all images details request.
         response = self._do_get('images/detail')
         subs = self._get_regexes()
-        return self._verify_response('images-details-get-resp', subs,
-                                     response, 200)
+        self._verify_response('images-details-get-resp', subs, response, 200)
 
     def test_image_metadata_get(self):
         # Get api sample of an image metadata request.
@@ -705,8 +696,7 @@ class ImagesSampleJsonTest(ApiSampleTestBase):
         response = self._do_get('images/%s/metadata' % image_id)
         subs = self._get_regexes()
         subs['image_id'] = image_id
-        return self._verify_response('image-metadata-get-resp', subs,
-                                     response, 200)
+        self._verify_response('image-metadata-get-resp', subs, response, 200)
 
     def test_image_metadata_post(self):
         # Get api sample to update metadata of an image metadata request.
@@ -715,8 +705,7 @@ class ImagesSampleJsonTest(ApiSampleTestBase):
                 'images/%s/metadata' % image_id,
                 'image-metadata-post-req', {})
         subs = self._get_regexes()
-        return self._verify_response('image-metadata-post-resp', subs,
-                                     response, 200)
+        self._verify_response('image-metadata-post-resp', subs, response, 200)
 
     def test_image_metadata_put(self):
         # Get api sample of image metadata put request.
@@ -724,8 +713,7 @@ class ImagesSampleJsonTest(ApiSampleTestBase):
         response = self._do_put('images/%s/metadata' % image_id,
                                 'image-metadata-put-req', {})
         subs = self._get_regexes()
-        return self._verify_response('image-metadata-put-resp', subs,
-                                     response, 200)
+        self._verify_response('image-metadata-put-resp', subs, response, 200)
 
     def test_image_meta_key_get(self):
         # Get api sample of an image metadata key request.
@@ -733,7 +721,7 @@ class ImagesSampleJsonTest(ApiSampleTestBase):
         key = "kernel_id"
         response = self._do_get('images/%s/metadata/%s' % (image_id, key))
         subs = self._get_regexes()
-        return self._verify_response('image-meta-key-get', subs, response, 200)
+        self._verify_response('image-meta-key-get', subs, response, 200)
 
     def test_image_meta_key_put(self):
         # Get api sample of image metadata key put request.
@@ -742,8 +730,7 @@ class ImagesSampleJsonTest(ApiSampleTestBase):
         response = self._do_put('images/%s/metadata/%s' % (image_id, key),
                                 'image-meta-key-put-req', {})
         subs = self._get_regexes()
-        return self._verify_response('image-meta-key-put-resp', subs,
-                                     response, 200)
+        self._verify_response('image-meta-key-put-resp', subs, response, 200)
 
 
 class ImagesSampleXmlTest(ImagesSampleJsonTest):
@@ -754,7 +741,7 @@ class LimitsSampleJsonTest(ApiSampleTestBase):
     def test_limits_get(self):
         response = self._do_get('limits')
         subs = self._get_regexes()
-        return self._verify_response('limit-get-resp', subs, response, 200)
+        self._verify_response('limit-get-resp', subs, response, 200)
 
 
 class LimitsSampleXmlTest(LimitsSampleJsonTest):
@@ -800,8 +787,7 @@ class CoverageExtJsonTests(ApiSampleTestBase):
         response = self._do_post('os-coverage/action',
                                  'coverage-stop-post-req', subs)
         subs.update(self._get_regexes())
-        return self._verify_response('coverage-stop-post-resp',
-                                     subs, response, 200)
+        self._verify_response('coverage-stop-post-resp', subs, response, 200)
 
     def test_report_coverage(self):
         # Generate a coverage report.
@@ -812,8 +798,7 @@ class CoverageExtJsonTests(ApiSampleTestBase):
         response = self._do_post('os-coverage/action',
                                  'coverage-report-post-req', subs)
         subs.update(self._get_regexes())
-        return self._verify_response('coverage-report-post-resp',
-                                     subs, response, 200)
+        self._verify_response('coverage-report-post-resp', subs, response, 200)
 
     def test_xml_report_coverage(self):
         subs = {
@@ -823,8 +808,8 @@ class CoverageExtJsonTests(ApiSampleTestBase):
         response = self._do_post('os-coverage/action',
                                  'coverage-xml-report-post-req', subs)
         subs.update(self._get_regexes())
-        return self._verify_response('coverage-xml-report-post-resp',
-                                     subs, response, 200)
+        self._verify_response('coverage-xml-report-post-resp',
+                              subs, response, 200)
 
 
 class CoverageExtXmlTests(CoverageExtJsonTests):
@@ -840,7 +825,7 @@ class ServersActionsJsonTest(ServersSampleBase):
                                  subs)
         if resp_tpl:
             subs.update(self._get_regexes())
-            return self._verify_response(resp_tpl, subs, response, code)
+            self._verify_response(resp_tpl, subs, response, code)
         else:
             self.assertEqual(response.status, code)
             self.assertEqual(response.read(), "")
@@ -946,7 +931,7 @@ class UserDataJsonTest(ApiSampleTestBase):
         response = self._do_post('servers', 'userdata-post-req', subs)
 
         subs.update(self._get_regexes())
-        return self._verify_response('userdata-post-resp', subs, response, 202)
+        self._verify_response('userdata-post-resp', subs, response, 202)
 
 
 class UserDataXmlTest(UserDataJsonTest):
@@ -973,14 +958,14 @@ class FlavorsExtraDataJsonTest(ApiSampleTestBase):
             'flavor_name': 'm1.tiny'
         }
         subs.update(self._get_regexes())
-        return self._verify_response('flavors-extra-data-get-resp', subs,
-                                     response, 200)
+        self._verify_response('flavors-extra-data-get-resp',
+                              subs, response, 200)
 
     def test_flavors_extra_data_list(self):
         response = self._do_get('flavors/detail')
         subs = self._get_regexes()
-        return self._verify_response('flavors-extra-data-list-resp', subs,
-                                     response, 200)
+        self._verify_response('flavors-extra-data-list-resp',
+                              subs, response, 200)
 
     def test_flavors_extra_data_create(self):
         subs = {
@@ -991,8 +976,8 @@ class FlavorsExtraDataJsonTest(ApiSampleTestBase):
                                  'flavors-extra-data-post-req',
                                  subs)
         subs.update(self._get_regexes())
-        return self._verify_response('flavors-extra-data-post-resp',
-                                     subs, response, 200)
+        self._verify_response('flavors-extra-data-post-resp',
+                              subs, response, 200)
 
 
 class FlavorsExtraDataXmlTest(FlavorsExtraDataJsonTest):
@@ -1019,14 +1004,12 @@ class FlavorRxtxJsonTest(ApiSampleTestBase):
             'flavor_name': 'm1.tiny'
         }
         subs.update(self._get_regexes())
-        return self._verify_response('flavor-rxtx-get-resp', subs,
-                                     response, 200)
+        self._verify_response('flavor-rxtx-get-resp', subs, response, 200)
 
     def test_flavors_rxtx_list(self):
         response = self._do_get('flavors/detail')
         subs = self._get_regexes()
-        return self._verify_response('flavor-rxtx-list-resp', subs,
-                                     response, 200)
+        self._verify_response('flavor-rxtx-list-resp', subs, response, 200)
 
     def test_flavors_rxtx_create(self):
         subs = {
@@ -1037,8 +1020,7 @@ class FlavorRxtxJsonTest(ApiSampleTestBase):
                                  'flavor-rxtx-post-req',
                                  subs)
         subs.update(self._get_regexes())
-        return self._verify_response('flavor-rxtx-post-resp',
-                                     subs, response, 200)
+        self._verify_response('flavor-rxtx-post-resp', subs, response, 200)
 
 
 class FlavorRxtxXmlTest(FlavorRxtxJsonTest):
@@ -1065,14 +1047,12 @@ class FlavorSwapJsonTest(ApiSampleTestBase):
             'flavor_name': 'm1.tiny'
         }
         subs.update(self._get_regexes())
-        return self._verify_response('flavor-swap-get-resp', subs,
-                                     response, 200)
+        self._verify_response('flavor-swap-get-resp', subs, response, 200)
 
     def test_flavor_swap_list(self):
         response = self._do_get('flavors/detail')
         subs = self._get_regexes()
-        return self._verify_response('flavor-swap-list-resp', subs,
-                                     response, 200)
+        self._verify_response('flavor-swap-list-resp', subs, response, 200)
 
     def test_flavor_swap_create(self):
         subs = {
@@ -1083,8 +1063,7 @@ class FlavorSwapJsonTest(ApiSampleTestBase):
                                  'flavor-swap-post-req',
                                  subs)
         subs.update(self._get_regexes())
-        return self._verify_response('flavor-swap-post-resp',
-                                     subs, response, 200)
+        self._verify_response('flavor-swap-post-resp', subs, response, 200)
 
 
 class FlavorSwapXmlTest(FlavorSwapJsonTest):
@@ -1110,8 +1089,8 @@ class SecurityGroupsSampleJsonTest(ServersSampleBase):
         subs = {
                 'group_name': 'test'
         }
-        return  self._do_post('servers/%s/action' % uuid,
-                              'security-group-add-post-req', subs)
+        return self._do_post('servers/%s/action' % uuid,
+                             'security-group-add-post-req', subs)
 
     def test_security_group_create(self):
         response = self._create_security_group()
@@ -1123,24 +1102,23 @@ class SecurityGroupsSampleJsonTest(ServersSampleBase):
         # Get api sample of security groups get list request.
         response = self._do_get('os-security-groups')
         subs = self._get_regexes()
-        return self._verify_response('security-groups-list-get-resp',
-                                      subs, response, 200)
+        self._verify_response('security-groups-list-get-resp',
+                              subs, response, 200)
 
     def test_security_groups_get(self):
         # Get api sample of security groups get request.
         security_group_id = '1'
         response = self._do_get('os-security-groups/%s' % security_group_id)
         subs = self._get_regexes()
-        return self._verify_response('security-groups-get-resp',
-                                      subs, response, 200)
+        self._verify_response('security-groups-get-resp', subs, response, 200)
 
     def test_security_groups_list_server(self):
         # Get api sample of security groups for a specific server.
         uuid = self._post_server()
         response = self._do_get('servers/%s/os-security-groups' % uuid)
         subs = self._get_regexes()
-        return self._verify_response('server-security-groups-list-resp',
-                                      subs, response, 200)
+        self._verify_response('server-security-groups-list-resp',
+                              subs, response, 200)
 
     def test_security_groups_add(self):
         self._create_security_group()
@@ -1175,21 +1153,21 @@ class SecurityGroupDefaultRulesSampleJsonTest(ServersSampleBase):
         response = self._do_post('os-security-group-default-rules',
                                  'security-group-default-rules-create-req',
                                  {})
-        return self._verify_response(
-            'security-group-default-rules-create-resp', {}, response, 200)
+        self._verify_response('security-group-default-rules-create-resp',
+                              {}, response, 200)
 
     def test_security_group_default_rules_list(self):
         self.test_security_group_default_rules_create()
         response = self._do_get('os-security-group-default-rules')
-        return self._verify_response('security-group-default-rules-list-resp',
-                                     {}, response, 200)
+        self._verify_response('security-group-default-rules-list-resp',
+                              {}, response, 200)
 
     def test_security_group_default_rules_show(self):
         self.test_security_group_default_rules_create()
         rule_id = '1'
         response = self._do_get('os-security-group-default-rules/%s' % rule_id)
-        return self._verify_response('security-group-default-rules-show-resp',
-                                     {}, response, 200)
+        self._verify_response('security-group-default-rules-show-resp',
+                              {}, response, 200)
 
 
 class SecurityGroupDefaultRulesSampleXmlTest(
@@ -1209,8 +1187,7 @@ class SchedulerHintsJsonTest(ApiSampleTestBase):
         response = self._do_post('servers', 'scheduler-hints-post-req',
                                  hints)
         subs = self._get_regexes()
-        return self._verify_response('scheduler-hints-post-resp', subs,
-                                     response, 202)
+        self._verify_response('scheduler-hints-post-resp', subs, response, 202)
 
 
 class SchedulerHintsXmlTest(SchedulerHintsJsonTest):
@@ -1227,8 +1204,7 @@ class ConsoleOutputSampleJsonTest(ServersSampleBase):
                                  'console-output-post-req',
                                 {'action': 'os-getConsoleOutput'})
         subs = self._get_regexes()
-        return self._verify_response('console-output-post-resp',
-                                       subs, response, 200)
+        self._verify_response('console-output-post-resp', subs, response, 200)
 
 
 class ConsoleOutputSampleXmlTest(ConsoleOutputSampleJsonTest):
@@ -1249,8 +1225,7 @@ class ExtendedServerAttributesJsonTest(ServersSampleBase):
         subs['id'] = uuid
         subs['instance_name'] = 'instance-\d{8}'
         subs['hypervisor_hostname'] = r'[\w\.\-]+'
-        return self._verify_response('server-get-resp',
-                                     subs, response, 200)
+        self._verify_response('server-get-resp', subs, response, 200)
 
     def test_detail(self):
         uuid = self._post_server()
@@ -1261,8 +1236,7 @@ class ExtendedServerAttributesJsonTest(ServersSampleBase):
         subs['id'] = uuid
         subs['instance_name'] = 'instance-\d{8}'
         subs['hypervisor_hostname'] = r'[\w\.\-]+'
-        return self._verify_response('servers-detail-resp',
-                                     subs, response, 200)
+        self._verify_response('servers-detail-resp', subs, response, 200)
 
 
 class ExtendedServerAttributesXmlTest(ExtendedServerAttributesJsonTest):
@@ -1307,8 +1281,8 @@ class FloatingIpsJsonTest(ApiSampleTestBase):
         response = self._do_get('os-floating-ips')
 
         subs = self._get_regexes()
-        return self._verify_response('floating-ips-list-empty-resp',
-                                     subs, response, 200)
+        self._verify_response('floating-ips-list-empty-resp',
+                              subs, response, 200)
 
     def test_floating_ips_list(self):
         self._do_post('os-floating-ips',
@@ -1320,8 +1294,8 @@ class FloatingIpsJsonTest(ApiSampleTestBase):
 
         response = self._do_get('os-floating-ips')
         subs = self._get_regexes()
-        return self._verify_response('floating-ips-list-resp',
-                                     subs, response, 200)
+        self._verify_response('floating-ips-list-resp',
+                              subs, response, 200)
 
     def test_floating_ips_create_nopool(self):
         response = self._do_post('os-floating-ips',
@@ -1336,8 +1310,7 @@ class FloatingIpsJsonTest(ApiSampleTestBase):
                                  'floating-ips-create-req',
                                  {"pool": CONF.default_floating_pool})
         subs = self._get_regexes()
-        self._verify_response('floating-ips-create-resp',
-                              subs, response, 200)
+        self._verify_response('floating-ips-create-resp', subs, response, 200)
 
     def test_floating_ips_get(self):
         self.test_floating_ips_create()
@@ -1345,8 +1318,7 @@ class FloatingIpsJsonTest(ApiSampleTestBase):
         # but it would be better if we could get this from the create
         response = self._do_get('os-floating-ips/%d' % 1)
         subs = self._get_regexes()
-        self._verify_response('floating-ips-create-resp',
-                              subs, response, 200)
+        self._verify_response('floating-ips-create-resp', subs, response, 200)
 
     def test_floating_ips_delete(self):
         self.test_floating_ips_create()
@@ -1407,14 +1379,14 @@ class FloatingIpsBulkJsonTest(ApiSampleTestBase):
     def test_floating_ips_bulk_list(self):
         response = self._do_get('os-floating-ips-bulk')
         subs = self._get_regexes()
-        return self._verify_response('floating-ips-bulk-list-resp', subs,
-                                     response, 200)
+        self._verify_response('floating-ips-bulk-list-resp',
+                              subs, response, 200)
 
     def test_floating_ips_bulk_list_by_host(self):
         response = self._do_get('os-floating-ips-bulk/testHost')
         subs = self._get_regexes()
-        return self._verify_response('floating-ips-bulk-list-by-host-resp',
-                                     subs, response, 200)
+        self._verify_response('floating-ips-bulk-list-by-host-resp',
+                              subs, response, 200)
 
     def test_floating_ips_bulk_create(self):
         response = self._do_post('os-floating-ips-bulk',
@@ -1423,16 +1395,16 @@ class FloatingIpsBulkJsonTest(ApiSampleTestBase):
                                   "pool": CONF.default_floating_pool,
                                   "interface": CONF.public_interface})
         subs = self._get_regexes()
-        return self._verify_response('floating-ips-bulk-create-resp', subs,
-                                     response, 200)
+        self._verify_response('floating-ips-bulk-create-resp', subs,
+                              response, 200)
 
     def test_floating_ips_bulk_delete(self):
         response = self._do_put('os-floating-ips-bulk/delete',
                                 'floating-ips-bulk-delete-req',
                                 {"ip_range": "192.168.1.0/24"})
         subs = self._get_regexes()
-        return self._verify_response('floating-ips-bulk-delete-resp', subs,
-                                     response, 200)
+        self._verify_response('floating-ips-bulk-delete-resp', subs,
+                              response, 200)
 
 
 class FloatingIpsBulkXmlTest(FloatingIpsBulkJsonTest):
@@ -1482,7 +1454,7 @@ class KeyPairsSampleJsonTest(ApiSampleTestBase):
         response = self._do_get('os-keypairs')
         subs = self._get_regexes()
         subs['keypair_name'] = '(%s)' % key_name
-        return self._verify_response('keypairs-get-resp', subs, response, 200)
+        self._verify_response('keypairs-get-resp', subs, response, 200)
 
 
 class KeyPairsSampleXmlTest(KeyPairsSampleJsonTest):
@@ -1601,8 +1573,7 @@ class CloudPipeSampleJsonTest(ApiSampleTestBase):
         subs = self._get_regexes()
         subs.update(project)
         subs['image_id'] = CONF.vpn_image_id
-        return self._verify_response('cloud-pipe-get-resp', subs,
-                                     response, 200)
+        self._verify_response('cloud-pipe-get-resp', subs, response, 200)
 
 
 class CloudPipeSampleXmlTest(CloudPipeSampleJsonTest):
@@ -1710,7 +1681,7 @@ class AgentsJsonTest(ApiSampleTestBase):
                 'md5hash': 'add6bb58e139be103324d04d82d8f545',
                 'agent_id': 1
                 }
-        return self._verify_response('agents-get-resp', project, response, 200)
+        self._verify_response('agents-get-resp', project, response, 200)
 
     def test_agent_update(self):
         # Update an existing agent build.
@@ -1721,8 +1692,7 @@ class AgentsJsonTest(ApiSampleTestBase):
         response = self._do_put('os-agents/%s' % agent_id,
                                 'agent-update-put-req', subs)
         subs['agent_id'] = 1
-        return self._verify_response('agent-update-put-resp', subs,
-                                     response, 200)
+        self._verify_response('agent-update-put-resp', subs, response, 200)
 
     def test_agent_delete(self):
         # Deletes an existing agent build.
@@ -1811,8 +1781,7 @@ class FixedIpJsonTest(ApiSampleTestBase):
                    'hostname': 'openstack',
                    'host': 'host',
                    'address': '192.168.1.1'}
-        return self._verify_response('fixedips-get-resp', project,
-                                     response, 200)
+        self._verify_response('fixedips-get-resp', project, response, 200)
 
 
 class FixedIpXmlTest(FixedIpJsonTest):
@@ -1829,22 +1798,20 @@ class AggregatesSampleJsonTest(ServersSampleBase):
         }
         response = self._do_post('os-aggregates', 'aggregate-post-req', subs)
         subs.update(self._get_regexes())
-        return self._verify_response('aggregate-post-resp', subs,
-                                     response, 200)
+        return self._verify_response('aggregate-post-resp',
+                                     subs, response, 200)
 
     def test_list_aggregates(self):
         self.test_aggregate_create()
         response = self._do_get('os-aggregates')
         subs = self._get_regexes()
-        return self._verify_response('aggregates-list-get-resp', subs,
-                                     response, 200)
+        self._verify_response('aggregates-list-get-resp', subs, response, 200)
 
     def test_aggregate_get(self):
         agg_id = self.test_aggregate_create()
         response = self._do_get('os-aggregates/%s' % agg_id)
         subs = self._get_regexes()
-        return self._verify_response('aggregates-get-resp', subs,
-                                     response, 200)
+        self._verify_response('aggregates-get-resp', subs, response, 200)
 
     def test_add_metadata(self):
         agg_id = self.test_aggregate_create()
@@ -1852,8 +1819,8 @@ class AggregatesSampleJsonTest(ServersSampleBase):
                                  'aggregate-metadata-post-req',
                                  {'action': 'set_metadata'})
         subs = self._get_regexes()
-        return self._verify_response('aggregates-metadata-post-resp', subs,
-                                     response, 200)
+        self._verify_response('aggregates-metadata-post-resp', subs,
+                              response, 200)
 
     def test_add_host(self):
         aggregate_id = self.test_aggregate_create()
@@ -1863,8 +1830,8 @@ class AggregatesSampleJsonTest(ServersSampleBase):
         response = self._do_post('os-aggregates/%s/action' % aggregate_id,
                                  'aggregate-add-host-post-req', subs)
         subs.update(self._get_regexes())
-        return self._verify_response('aggregates-add-host-post-resp', subs,
-                                     response, 200)
+        self._verify_response('aggregates-add-host-post-resp', subs,
+                              response, 200)
 
     def test_remove_host(self):
         self.test_add_host()
@@ -1874,16 +1841,16 @@ class AggregatesSampleJsonTest(ServersSampleBase):
         response = self._do_post('os-aggregates/1/action',
                                  'aggregate-remove-host-post-req', subs)
         subs.update(self._get_regexes())
-        return self._verify_response('aggregates-remove-host-post-resp',
-                                      subs, response, 200)
+        self._verify_response('aggregates-remove-host-post-resp',
+                              subs, response, 200)
 
     def test_update_aggregate(self):
         aggregate_id = self.test_aggregate_create()
         response = self._do_put('os-aggregates/%s' % aggregate_id,
                                   'aggregate-update-post-req', {})
         subs = self._get_regexes()
-        return self._verify_response('aggregate-update-post-resp',
-                                      subs, response, 200)
+        self._verify_response('aggregate-update-post-resp',
+                              subs, response, 200)
 
 
 class AggregatesSampleXmlTest(AggregatesSampleJsonTest):
@@ -1898,14 +1865,12 @@ class CertificatesSamplesJsonTest(ApiSampleTestBase):
         response = self._do_post('os-certificates',
                                  'certificate-create-req', {})
         subs = self._get_regexes()
-        return self._verify_response('certificate-create-resp', subs,
-                                     response, 200)
+        self._verify_response('certificate-create-resp', subs, response, 200)
 
     def test_get_root_certificate(self):
         response = self._do_get('os-certificates/root')
         subs = self._get_regexes()
-        return self._verify_response('certificate-get-root-resp', subs,
-                                     response, 200)
+        self._verify_response('certificate-get-root-resp', subs, response, 200)
 
 
 class CertificatesSamplesXmlTest(CertificatesSamplesJsonTest):
@@ -1920,8 +1885,7 @@ class UsedLimitsSamplesJsonTest(ApiSampleTestBase):
         # Get api sample to used limits.
         response = self._do_get('limits')
         subs = self._get_regexes()
-        return self._verify_response('usedlimits-get-resp', subs,
-                                     response, 200)
+        self._verify_response('usedlimits-get-resp', subs, response, 200)
 
 
 class UsedLimitsSamplesXmlTest(UsedLimitsSamplesJsonTest):
@@ -1941,8 +1905,7 @@ class MultipleCreateJsonTest(ServersSampleBase):
         }
         response = self._do_post('servers', 'multiple-create-post-req', subs)
         subs.update(self._get_regexes())
-        return self._verify_response('multiple-create-post-resp', subs,
-                                     response, 202)
+        self._verify_response('multiple-create-post-resp', subs, response, 202)
 
     def test_multiple_create_without_reservation_id(self):
         subs = {
@@ -1954,8 +1917,8 @@ class MultipleCreateJsonTest(ServersSampleBase):
         response = self._do_post('servers', 'multiple-create-no-resv-post-req',
                                   subs)
         subs.update(self._get_regexes())
-        return self._verify_response('multiple-create-no-resv-post-resp', subs,
-                                     response, 202)
+        self._verify_response('multiple-create-no-resv-post-resp', subs,
+                              response, 202)
 
 
 class MultipleCreateXmlTest(MultipleCreateJsonTest):
@@ -1988,8 +1951,7 @@ class ServicesJsonTest(ApiSampleTestBase):
                 'status': 'disabled',
                 'state': 'up'}
         subs.update(self._get_regexes())
-        return self._verify_response('services-list-get-resp',
-                                     subs, response, 200)
+        self._verify_response('services-list-get-resp', subs, response, 200)
 
     def test_service_enable(self):
         """Enable an existing agent build."""
@@ -1999,8 +1961,7 @@ class ServicesJsonTest(ApiSampleTestBase):
                                 'service-enable-put-req', subs)
         subs = {"host": "host1",
                 "binary": "nova-compute"}
-        return self._verify_response('service-enable-put-resp', subs,
-                                     response, 200)
+        self._verify_response('service-enable-put-resp', subs, response, 200)
 
     def test_service_disable(self):
         """Disable an existing agent build."""
@@ -2010,8 +1971,7 @@ class ServicesJsonTest(ApiSampleTestBase):
                                 'service-disable-put-req', subs)
         subs = {"host": "host1",
                 "binary": "nova-compute"}
-        return self._verify_response('service-disable-put-resp', subs,
-                                     response, 200)
+        self._verify_response('service-disable-put-resp', subs, response, 200)
 
 
 class ServicesXmlTest(ServicesJsonTest):
@@ -2043,8 +2003,7 @@ class SimpleTenantUsageSampleJsonTest(ServersSampleBase):
         response = self._do_get('os-simple-tenant-usage?%s' % (
                                                 urllib.urlencode(self.query)))
         subs = self._get_regexes()
-        self._verify_response('simple-tenant-usage-get', subs,
-                              response, 200)
+        self._verify_response('simple-tenant-usage-get', subs, response, 200)
 
     def test_get_tenant_usage_details(self):
         # Get api sample to get specific tenant usage request.
@@ -2068,8 +2027,8 @@ class ServerDiagnosticsSamplesJsonTest(ServersSampleBase):
         uuid = self._post_server()
         response = self._do_get('servers/%s/diagnostics' % uuid)
         subs = self._get_regexes()
-        return self._verify_response('server-diagnostics-get-resp', subs,
-                                     response, 200)
+        self._verify_response('server-diagnostics-get-resp', subs,
+                              response, 200)
 
 
 class ServerDiagnosticsSamplesXmlTest(ServerDiagnosticsSamplesJsonTest):
@@ -2088,8 +2047,8 @@ class AvailabilityZoneJsonTest(ServersSampleBase):
         }
         response = self._do_post('servers', 'availability-zone-post-req', subs)
         subs.update(self._get_regexes())
-        return self._verify_response('availability-zone-post-resp', subs,
-                                     response, 202)
+        self._verify_response('availability-zone-post-resp', subs,
+                              response, 202)
 
 
 class AvailabilityZoneXmlTest(AvailabilityZoneJsonTest):
@@ -2243,8 +2202,7 @@ class ConsolesSampleJsonTests(ServersSampleBase):
         subs = self._get_regexes()
         subs["url"] = \
             "((https?):((//)|(\\\\))+([\w\d:#@%/;$()~_?\+-=\\\.&](#!)?)*)"
-        return self._verify_response('get-vnc-console-post-resp',
-                                       subs, response, 200)
+        self._verify_response('get-vnc-console-post-resp', subs, response, 200)
 
     def test_get_spice_console(self):
         uuid = self._post_server()
@@ -2254,8 +2212,8 @@ class ConsolesSampleJsonTests(ServersSampleBase):
         subs = self._get_regexes()
         subs["url"] = \
             "((https?):((//)|(\\\\))+([\w\d:#@%/;$()~_?\+-=\\\.&](#!)?)*)"
-        return self._verify_response('get-spice-console-post-resp', subs,
-                                     response, 200)
+        self._verify_response('get-spice-console-post-resp', subs,
+                              response, 200)
 
 
 class ConsolesSampleXmlTests(ConsolesSampleJsonTests):
@@ -2299,21 +2257,20 @@ class QuotasSampleJsonTests(ApiSampleTestBase):
     def test_show_quotas(self):
         # Get api sample to show quotas.
         response = self._do_get('os-quota-sets/fake_tenant')
-        return self._verify_response('quotas-show-get-resp', {}, response, 200)
+        self._verify_response('quotas-show-get-resp', {}, response, 200)
 
     def test_show_quotas_defaults(self):
         # Get api sample to show quotas defaults.
         response = self._do_get('os-quota-sets/fake_tenant/defaults')
-        return self._verify_response('quotas-show-defaults-get-resp',
-                                     {}, response, 200)
+        self._verify_response('quotas-show-defaults-get-resp',
+                              {}, response, 200)
 
     def test_update_quotas(self):
         # Get api sample to update quotas.
         response = self._do_put('os-quota-sets/fake_tenant',
                                 'quotas-update-post-req',
                                 {})
-        return self._verify_response('quotas-update-post-resp', {},
-                                     response, 200)
+        self._verify_response('quotas-update-post-resp', {}, response, 200)
 
 
 class QuotasSampleXmlTests(QuotasSampleJsonTests):
@@ -2331,7 +2288,7 @@ class ExtendedIpsSampleJsonTests(ServersSampleBase):
         subs['hostid'] = '[a-f0-9]+'
         subs['id'] = uuid
         subs['hypervisor_hostname'] = r'[\w\.\-]+'
-        return self._verify_response('server-get-resp', subs, response, 200)
+        self._verify_response('server-get-resp', subs, response, 200)
 
     def test_detail(self):
         uuid = self._post_server()
@@ -2339,8 +2296,7 @@ class ExtendedIpsSampleJsonTests(ServersSampleBase):
         subs = self._get_regexes()
         subs['id'] = uuid
         subs['hostid'] = '[a-f0-9]+'
-        return self._verify_response('servers-detail-resp', subs,
-                                     response, 200)
+        self._verify_response('servers-detail-resp', subs, response, 200)
 
 
 class ExtendedIpsSampleXmlTests(ExtendedIpsSampleJsonTests):
@@ -2360,8 +2316,7 @@ class ExtendedIpsMacSampleJsonTests(ServersSampleBase):
         subs['id'] = uuid
         subs['hypervisor_hostname'] = r'[\w\.\-]+'
         subs['mac_addr'] = '(?:[a-f0-9]{2}:){5}[a-f0-9]{2}'
-        return self._verify_response('server-get-resp', subs,
-                                     response, 200)
+        self._verify_response('server-get-resp', subs, response, 200)
 
     def test_detail(self):
         uuid = self._post_server()
@@ -2371,8 +2326,7 @@ class ExtendedIpsMacSampleJsonTests(ServersSampleBase):
         subs['id'] = uuid
         subs['hostid'] = '[a-f0-9]+'
         subs['mac_addr'] = '(?:[a-f0-9]{2}:){5}[a-f0-9]{2}'
-        return self._verify_response('servers-detail-resp', subs,
-                                     response, 200)
+        self._verify_response('servers-detail-resp', subs, response, 200)
 
 
 class ExtendedIpsMacSampleXmlTests(ExtendedIpsMacSampleJsonTests):
@@ -2388,7 +2342,7 @@ class ExtendedStatusSampleJsonTests(ServersSampleBase):
         response = self._do_get('servers/%s' % uuid)
         subs = self._get_regexes()
         subs['hostid'] = '[a-f0-9]+'
-        return self._verify_response('server-get-resp', subs, response, 200)
+        self._verify_response('server-get-resp', subs, response, 200)
 
     def test_detail(self):
         uuid = self._post_server()
@@ -2396,8 +2350,7 @@ class ExtendedStatusSampleJsonTests(ServersSampleBase):
         subs = self._get_regexes()
         subs['id'] = uuid
         subs['hostid'] = '[a-f0-9]+'
-        return self._verify_response('servers-detail-resp', subs,
-                                     response, 200)
+        self._verify_response('servers-detail-resp', subs, response, 200)
 
 
 class ExtendedStatusSampleXmlTests(ExtendedStatusSampleJsonTests):
@@ -2448,8 +2401,7 @@ class FlavorManageSampleJsonTests(ApiSampleTestBase):
                                  "flavor-create-post-req",
                                  subs)
         subs.update(self._get_regexes())
-        return self._verify_response("flavor-create-post-resp", subs,
-                                     response, 200)
+        self._verify_response("flavor-create-post-resp", subs, response, 200)
 
     def test_create_flavor(self):
         # Get api sample to create a flavor.
@@ -2487,7 +2439,7 @@ class ServerPasswordSampleJsonTests(ServersSampleBase):
         response = self._do_get('servers/%s/os-server-password' % uuid)
         subs = self._get_regexes()
         subs['encrypted_password'] = fake_ext_password().replace('+', '\\+')
-        return self._verify_response('get-password-resp', subs, response, 200)
+        self._verify_response('get-password-resp', subs, response, 200)
 
     def test_reset_password(self):
         uuid = self._post_server()
@@ -2509,15 +2461,14 @@ class DiskConfigJsonTest(ServersSampleBase):
         subs = self._get_regexes()
         subs['hostid'] = '[a-f0-9]+'
         subs['id'] = uuid
-        return self._verify_response('list-servers-detail-get', subs,
-                                     response, 200)
+        self._verify_response('list-servers-detail-get', subs, response, 200)
 
     def test_get_server(self):
         uuid = self._post_server()
         response = self._do_get('servers/%s' % uuid)
         subs = self._get_regexes()
         subs['hostid'] = '[a-f0-9]+'
-        return self._verify_response('server-get-resp', subs, response, 200)
+        self._verify_response('server-get-resp', subs, response, 200)
 
     def test_update_server(self):
         uuid = self._post_server()
@@ -2525,8 +2476,7 @@ class DiskConfigJsonTest(ServersSampleBase):
                                 'server-update-put-req', {})
         subs = self._get_regexes()
         subs['hostid'] = '[a-f0-9]+'
-        return self._verify_response('server-update-put-resp',
-                                      subs, response, 200)
+        self._verify_response('server-update-put-resp', subs, response, 200)
 
     def test_resize_server(self):
         self.flags(allow_resize_to_same_host=True)
@@ -2548,20 +2498,20 @@ class DiskConfigJsonTest(ServersSampleBase):
                                  'server-action-rebuild-req', subs)
         subs = self._get_regexes()
         subs['hostid'] = '[a-f0-9]+'
-        return self._verify_response('server-action-rebuild-resp',
-                                      subs, response, 202)
+        self._verify_response('server-action-rebuild-resp',
+                              subs, response, 202)
 
     def test_get_image(self):
         image_id = fake.get_valid_image_id()
         response = self._do_get('images/%s' % image_id)
         subs = self._get_regexes()
         subs['image_id'] = image_id
-        return self._verify_response('image-get-resp', subs, response, 200)
+        self._verify_response('image-get-resp', subs, response, 200)
 
     def test_list_images(self):
         response = self._do_get('images/detail')
         subs = self._get_regexes()
-        return self._verify_response('image-list-resp', subs, response, 200)
+        self._verify_response('image-list-resp', subs, response, 200)
 
 
 class DiskConfigXmlTest(DiskConfigJsonTest):
@@ -2589,7 +2539,7 @@ class OsNetworksJsonTests(ApiSampleTestBase):
     def test_list_networks(self):
         response = self._do_get('os-tenant-networks')
         subs = self._get_regexes()
-        return self._verify_response('networks-list-res', subs, response, 200)
+        self._verify_response('networks-list-res', subs, response, 200)
 
     def test_create_network(self):
         response = self._do_post('os-tenant-networks', "networks-post-req", {})
@@ -2720,15 +2670,13 @@ class FlavorDisabledSampleJsonTests(ApiSampleTestBase):
         response = self._do_get('flavors/%s' % flavor_id)
         subs = self._get_regexes()
         subs['flavor_id'] = flavor_id
-        return self._verify_response('flavor-show-get-resp', subs,
-                                     response, 200)
+        self._verify_response('flavor-show-get-resp', subs, response, 200)
 
     def test_detail_flavor(self):
         # Get api sample to show details of a flavor.
         response = self._do_get('flavors/detail')
         subs = self._get_regexes()
-        return self._verify_response('flavor-detail-get-resp', subs,
-                                     response, 200)
+        self._verify_response('flavor-detail-get-resp', subs, response, 200)
 
 
 class FlavorDisabledSampleXmlTests(FlavorDisabledSampleJsonTests):
@@ -2744,16 +2692,16 @@ class QuotaClassesSampleJsonTests(ApiSampleTestBase):
         # Get api sample to show quota classes.
         response = self._do_get('os-quota-class-sets/%s' % self.set_id)
         subs = {'set_id': self.set_id}
-        return self._verify_response('quota-classes-show-get-resp', subs,
-                                     response, 200)
+        self._verify_response('quota-classes-show-get-resp', subs,
+                              response, 200)
 
     def test_update_quota_classes(self):
         # Get api sample to update quota classes.
         response = self._do_put('os-quota-class-sets/%s' % self.set_id,
                                 'quota-classes-update-post-req',
                                 {})
-        return self._verify_response('quota-classes-update-post-resp',
-                                     {}, response, 200)
+        self._verify_response('quota-classes-update-post-resp',
+                              {}, response, 200)
 
 
 class QuotaClassesSampleXmlTests(QuotaClassesSampleJsonTests):
@@ -2800,18 +2748,17 @@ class CellsSampleJsonTest(ApiSampleTestBase):
         self._stub_cells(num_cells=0)
         response = self._do_get('os-cells')
         subs = self._get_regexes()
-        return self._verify_response('cells-list-empty-resp', subs,
-                                     response, 200)
+        self._verify_response('cells-list-empty-resp', subs, response, 200)
 
     def test_cells_list(self):
         response = self._do_get('os-cells')
         subs = self._get_regexes()
-        return self._verify_response('cells-list-resp', subs, response, 200)
+        self._verify_response('cells-list-resp', subs, response, 200)
 
     def test_cells_get(self):
         response = self._do_get('os-cells/cell3')
         subs = self._get_regexes()
-        return self._verify_response('cells-get-resp', subs, response, 200)
+        self._verify_response('cells-get-resp', subs, response, 200)
 
 
 class CellsSampleXmlTest(CellsSampleJsonTest):
@@ -2839,8 +2786,8 @@ class BareMetalNodesJsonTest(ApiSampleTestBase, bm_db_base.BMDBTestCase):
         subs = {'node_id': '(?P<id>\d+)',
                 'interface_id': '\d+',
                 'address': address}
-        return self._verify_response("baremetal-node-create-with-address-resp",
-                                     subs, response, 200)
+        self._verify_response("baremetal-node-create-with-address-resp",
+                              subs, response, 200)
 
     def test_create_node(self):
         self._create_node()
@@ -2856,8 +2803,8 @@ class BareMetalNodesJsonTest(ApiSampleTestBase, bm_db_base.BMDBTestCase):
                 'interface_id': interface_id,
                 'address': 'aa:aa:aa:aa:aa:aa',
                 }
-        return self._verify_response('baremetal-node-list-resp', subs,
-                                     response, 200)
+        self._verify_response('baremetal-node-list-resp', subs,
+                              response, 200)
 
     def test_show_node(self):
         node_id = self._create_node()
@@ -2867,8 +2814,7 @@ class BareMetalNodesJsonTest(ApiSampleTestBase, bm_db_base.BMDBTestCase):
                 'interface_id': interface_id,
                 'address': 'aa:aa:aa:aa:aa:aa',
                 }
-        return self._verify_response('baremetal-node-show-resp', subs,
-                                     response, 200)
+        self._verify_response('baremetal-node-show-resp', subs, response, 200)
 
     def test_delete_node(self):
         node_id = self._create_node()
@@ -2919,8 +2865,7 @@ class FloatingIPPoolsSampleJsonTests(ApiSampleTestBase):
             'pool1': pool_list[0],
             'pool2': pool_list[1]
         }
-        return self._verify_response('floatingippools-list-resp', subs,
-                                     response, 200)
+        self._verify_response('floatingippools-list-resp', subs, response, 200)
 
 
 class FloatingIPPoolsSampleXmlTests(FloatingIPPoolsSampleJsonTests):
@@ -2960,15 +2905,15 @@ class InstanceUsageAuditLogJsonTest(ApiSampleTestBase):
                                 urllib.quote('2012-07-05 10:00:00'))
         subs = self._get_regexes()
         subs['hostid'] = '[a-f0-9]+'
-        return self._verify_response('inst-usage-audit-log-show-get-resp',
-                                     subs, response, 200)
+        self._verify_response('inst-usage-audit-log-show-get-resp',
+                              subs, response, 200)
 
     def test_index_instance_usage_audit_log(self):
         response = self._do_get('os-instance_usage_audit_log')
         subs = self._get_regexes()
         subs['hostid'] = '[a-f0-9]+'
-        return self._verify_response('inst-usage-audit-log-index-get-resp',
-                                     subs, response, 200)
+        self._verify_response('inst-usage-audit-log-index-get-resp',
+                              subs, response, 200)
 
 
 class InstanceUsageAuditLogXmlTest(InstanceUsageAuditLogJsonTest):
@@ -2985,15 +2930,15 @@ class FlavorExtraSpecsSampleJsonTests(ApiSampleTestBase):
         }
         response = self._do_post('flavors/1/os-extra_specs',
                                  'flavor-extra-specs-create-req', subs)
-        return self._verify_response('flavor-extra-specs-create-resp',
-                                     subs, response, 200)
+        self._verify_response('flavor-extra-specs-create-resp',
+                              subs, response, 200)
 
     def test_flavor_extra_specs_get(self):
         subs = {'value1': 'value1'}
         self._flavor_extra_specs_create()
         response = self._do_get('flavors/1/os-extra_specs/key1')
-        return self._verify_response('flavor-extra-specs-get-resp',
-                                     subs, response, 200)
+        self._verify_response('flavor-extra-specs-get-resp',
+                              subs, response, 200)
 
     def test_flavor_extra_specs_list(self):
         subs = {'value1': 'value1',
@@ -3001,19 +2946,19 @@ class FlavorExtraSpecsSampleJsonTests(ApiSampleTestBase):
         }
         self._flavor_extra_specs_create()
         response = self._do_get('flavors/1/os-extra_specs')
-        return self._verify_response('flavor-extra-specs-list-resp',
-                                     subs, response, 200)
+        self._verify_response('flavor-extra-specs-list-resp',
+                              subs, response, 200)
 
     def test_flavor_extra_specs_create(self):
-        return self._flavor_extra_specs_create()
+        self._flavor_extra_specs_create()
 
     def test_flavor_extra_specs_update(self):
         subs = {'value1': 'new_value1'}
         self._flavor_extra_specs_create()
         response = self._do_put('flavors/1/os-extra_specs/key1',
                                 'flavor-extra-specs-update-req', subs)
-        return self._verify_response('flavor-extra-specs-update-resp',
-                                     subs, response, 200)
+        self._verify_response('flavor-extra-specs-update-resp',
+                              subs, response, 200)
 
     def test_flavor_extra_specs_delete(self):
         self._flavor_extra_specs_create()
@@ -3042,14 +2987,13 @@ class FpingSampleJsonTests(ServersSampleBase):
         self._post_server()
         response = self._do_get('os-fping')
         subs = self._get_regexes()
-        return self._verify_response('fping-get-resp', subs, response, 200)
+        self._verify_response('fping-get-resp', subs, response, 200)
 
     def test_get_fping_details(self):
         uuid = self._post_server()
         response = self._do_get('os-fping/%s' % (uuid))
         subs = self._get_regexes()
-        return self._verify_response('fping-get-details-resp', subs,
-                                     response, 200)
+        self._verify_response('fping-get-details-resp', subs, response, 200)
 
 
 class FpingSampleXmlTests(FpingSampleJsonTests):
@@ -3066,15 +3010,14 @@ class ExtendedAvailabilityZoneJsonTests(ServersSampleBase):
         response = self._do_get('servers/%s' % uuid)
         subs = self._get_regexes()
         subs['hostid'] = '[a-f0-9]+'
-        return self._verify_response('server-get-resp', subs, response, 200)
+        self._verify_response('server-get-resp', subs, response, 200)
 
     def test_detail(self):
         uuid = self._post_server()
         response = self._do_get('servers/detail')
         subs = self._get_regexes()
         subs['hostid'] = '[a-f0-9]+'
-        return self._verify_response('servers-detail-resp', subs,
-                                     response, 200)
+        self._verify_response('servers-detail-resp', subs, response, 200)
 
 
 class ExtendedAvailabilityZoneXmlTests(ExtendedAvailabilityZoneJsonTests):
@@ -3105,8 +3048,7 @@ class EvacuateJsonTest(ServersSampleBase):
         response = self._do_post('servers/%s/action' % uuid,
                                  'server-evacuate-req', req_subs)
         subs = self._get_regexes()
-        return self._verify_response('server-evacuate-resp', subs,
-                                     response, 200)
+        self._verify_response('server-evacuate-resp', subs, response, 200)
 
 
 class EvacuateXmlTest(EvacuateJsonTest):
@@ -3149,8 +3091,8 @@ class FloatingIpDNSJsonTest(ApiSampleTestBase):
         subs = {'domain': self.domain,
                 'project': self.project,
                 'scope': self.scope}
-        return self._verify_response('floating-ip-dns-list-resp', subs,
-                                     response, 200)
+        self._verify_response('floating-ip-dns-list-resp', subs,
+                              response, 200)
 
     def test_floating_ip_dns_create_or_update(self):
         self._create_or_update()
@@ -3170,8 +3112,8 @@ class FloatingIpDNSJsonTest(ApiSampleTestBase):
         subs = {'domain': self.domain,
                 'ip': self.ip,
                 'name': self.name}
-        return self._verify_response('floating-ip-dns-entry-get-resp', subs,
-                                     response, 200)
+        self._verify_response('floating-ip-dns-entry-get-resp', subs,
+                              response, 200)
 
     def test_floating_ip_dns_entry_delete(self):
         self._create_or_update_entry()
@@ -3186,8 +3128,8 @@ class FloatingIpDNSJsonTest(ApiSampleTestBase):
         subs = {'domain': self.domain,
                 'ip': self.ip,
                 'name': self.name}
-        return self._verify_response('floating-ip-dns-entry-list-resp', subs,
-                                     response, 200)
+        self._verify_response('floating-ip-dns-entry-list-resp', subs,
+                              response, 200)
 
 
 class FloatingIpDNSXmlTest(FloatingIpDNSJsonTest):
@@ -3243,8 +3185,7 @@ class InstanceActionsSampleJsonTest(ApiSampleTestBase):
         subs['start_time'] = fake_action['start_time']
         subs['result'] = '(Success)|(Error)'
         subs['event'] = '(schedule)|(compute_create)'
-        return self._verify_response('instance-action-get-resp', subs,
-                                     response, 200)
+        self._verify_response('instance-action-get-resp', subs, response, 200)
 
     def test_instance_actions_list(self):
         fake_uuid = fake_instance_actions.FAKE_UUID
@@ -3254,8 +3195,8 @@ class InstanceActionsSampleJsonTest(ApiSampleTestBase):
         subs['integer_id'] = '[0-9]+'
         subs['request_id'] = ('req-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}'
                               '-[0-9a-f]{4}-[0-9a-f]{12}')
-        return self._verify_response('instance-actions-list-resp', subs,
-                                     response, 200)
+        self._verify_response('instance-actions-list-resp', subs,
+                              response, 200)
 
 
 class InstanceActionsSampleXmlTest(InstanceActionsSampleJsonTest):
@@ -3272,14 +3213,13 @@ class ImageSizeSampleJsonTests(ApiSampleTestBase):
         response = self._do_get('images/%s' % image_id)
         subs = self._get_regexes()
         subs['image_id'] = image_id
-        return self._verify_response('image-get-resp', subs, response, 200)
+        self._verify_response('image-get-resp', subs, response, 200)
 
     def test_detail(self):
         # Get api sample of all images details request.
         response = self._do_get('images/detail')
         subs = self._get_regexes()
-        return self._verify_response('images-details-get-resp', subs,
-                                     response, 200)
+        self._verify_response('images-details-get-resp', subs, response, 200)
 
 
 class ImageSizeSampleXmlTests(ImageSizeSampleJsonTests):
@@ -3303,8 +3243,8 @@ class ConfigDriveSampleJsonTest(ServersSampleBase):
         subs['hostid'] = '[a-f0-9]+'
         # config drive can be an uuid or empty value
         subs['cdrive'] = '(%s)?' % subs['uuid']
-        return self._verify_response('server-config-drive-get-resp', subs,
-                                     response, 200)
+        self._verify_response('server-config-drive-get-resp', subs,
+                              response, 200)
 
     def test_config_drive_detail(self):
         uuid = self._post_server()
@@ -3313,8 +3253,8 @@ class ConfigDriveSampleJsonTest(ServersSampleBase):
         subs['hostid'] = '[a-f0-9]+'
         # config drive can be an uuid or empty value
         subs['cdrive'] = '(%s)?' % subs['uuid']
-        return self._verify_response('servers-config-drive-details-resp',
-                                     subs, response, 200)
+        self._verify_response('servers-config-drive-details-resp',
+                              subs, response, 200)
 
 
 class ConfigDriveSampleXmlTest(ConfigDriveSampleJsonTest):
@@ -3341,8 +3281,8 @@ class FlavorAccessSampleJsonTests(ApiSampleTestBase):
         response = self._do_post('flavors/10/action',
                                  'flavor-access-add-tenant-req',
                                  subs)
-        return self._verify_response('flavor-access-add-tenant-resp',
-                                     subs, response, 200)
+        self._verify_response('flavor-access-add-tenant-resp',
+                              subs, response, 200)
 
     def _create_flavor(self):
         subs = {
@@ -3353,8 +3293,7 @@ class FlavorAccessSampleJsonTests(ApiSampleTestBase):
                                  "flavor-access-create-req",
                                  subs)
         subs.update(self._get_regexes())
-        return self._verify_response("flavor-access-create-resp",
-                                     subs, response, 200)
+        self._verify_response("flavor-access-create-resp", subs, response, 200)
 
     def test_flavor_access_create(self):
         self._create_flavor()
@@ -3362,8 +3301,7 @@ class FlavorAccessSampleJsonTests(ApiSampleTestBase):
     def test_flavor_access_detail(self):
         response = self._do_get('flavors/detail')
         subs = self._get_regexes()
-        return self._verify_response('flavor-access-detail-resp',
-                                     subs, response, 200)
+        self._verify_response('flavor-access-detail-resp', subs, response, 200)
 
     def test_flavor_access_list(self):
         self._create_flavor()
@@ -3374,8 +3312,7 @@ class FlavorAccessSampleJsonTests(ApiSampleTestBase):
             'flavor_id': flavor_id,
             'tenant_id': 'fake_tenant',
         }
-        return self._verify_response('flavor-access-list-resp',
-                                     subs, response, 200)
+        self._verify_response('flavor-access-list-resp', subs, response, 200)
 
     def test_flavor_access_show(self):
         flavor_id = 1
@@ -3384,8 +3321,7 @@ class FlavorAccessSampleJsonTests(ApiSampleTestBase):
             'flavor_id': flavor_id
         }
         subs.update(self._get_regexes())
-        return self._verify_response('flavor-access-show-resp',
-                                     subs, response, 200)
+        self._verify_response('flavor-access-show-resp', subs, response, 200)
 
     def test_flavor_access_add_tenant(self):
         self._create_flavor()
@@ -3400,8 +3336,8 @@ class FlavorAccessSampleJsonTests(ApiSampleTestBase):
         response = self._do_post('flavors/10/action',
                                  "flavor-access-remove-tenant-req",
                                  subs)
-        return self._verify_response('flavor-access-remove-tenant-resp',
-                                     {}, response, 200)
+        self._verify_response('flavor-access-remove-tenant-resp',
+                              {}, response, 200)
 
 
 class FlavorAccessSampleXmlTests(FlavorAccessSampleJsonTests):
@@ -3414,18 +3350,15 @@ class HypervisorsSampleJsonTests(ApiSampleTestBase):
 
     def test_hypervisors_list(self):
         response = self._do_get('os-hypervisors')
-        return self._verify_response('hypervisors-list-resp',
-                                     {}, response, 200)
+        self._verify_response('hypervisors-list-resp', {}, response, 200)
 
     def test_hypervisors_search(self):
         response = self._do_get('os-hypervisors/fake/search')
-        return self._verify_response('hypervisors-search-resp',
-                                     {}, response, 200)
+        self._verify_response('hypervisors-search-resp', {}, response, 200)
 
     def test_hypervisors_servers(self):
         response = self._do_get('os-hypervisors/fake/servers')
-        return self._verify_response('hypervisors-servers-resp',
-                                     {}, response, 200)
+        self._verify_response('hypervisors-servers-resp', {}, response, 200)
 
     def test_hypervisors_show(self):
         hypervisor_id = 1
@@ -3434,13 +3367,11 @@ class HypervisorsSampleJsonTests(ApiSampleTestBase):
         }
         response = self._do_get('os-hypervisors/%s' % hypervisor_id)
         subs.update(self._get_regexes())
-        return self._verify_response('hypervisors-show-resp',
-                                     subs, response, 200)
+        self._verify_response('hypervisors-show-resp', subs, response, 200)
 
     def test_hypervisors_statistics(self):
         response = self._do_get('os-hypervisors/statistics')
-        return self._verify_response('hypervisors-statistics-resp',
-                                     {}, response, 200)
+        self._verify_response('hypervisors-statistics-resp', {}, response, 200)
 
     def test_hypervisors_uptime(self):
         def fake_get_host_uptime(self, context, hyp):
@@ -3454,8 +3385,7 @@ class HypervisorsSampleJsonTests(ApiSampleTestBase):
         subs = {
             'hypervisor_id': hypervisor_id,
         }
-        return self._verify_response('hypervisors-uptime-resp',
-                                     subs, response, 200)
+        self._verify_response('hypervisors-uptime-resp', subs, response, 200)
 
 
 class HypervisorsSampleXmlTests(HypervisorsSampleJsonTests):
@@ -3659,8 +3589,8 @@ class SnapshotsSampleJsonTests(ApiSampleTestBase):
     def test_snapshots_create(self):
         response = self._create_snapshot()
         self.create_subs.update(self._get_regexes())
-        return self._verify_response("snapshot-create-resp",
-                                     self.create_subs, response, 200)
+        self._verify_response("snapshot-create-resp",
+                              self.create_subs, response, 200)
 
     def test_snapshots_delete(self):
         self.stubs.Set(cinder.API, "delete_snapshot",
@@ -3673,14 +3603,12 @@ class SnapshotsSampleJsonTests(ApiSampleTestBase):
     def test_snapshots_detail(self):
         response = self._do_get('os-snapshots/detail')
         subs = self._get_regexes()
-        return self._verify_response('snapshots-detail-resp', subs,
-                                     response, 200)
+        self._verify_response('snapshots-detail-resp', subs, response, 200)
 
     def test_snapshots_list(self):
         response = self._do_get('os-snapshots')
         subs = self._get_regexes()
-        return self._verify_response('snapshots-list-resp',
-                                     subs, response, 200)
+        self._verify_response('snapshots-list-resp', subs, response, 200)
 
     def test_snapshots_show(self):
         response = self._do_get('os-snapshots/100')
@@ -3689,8 +3617,7 @@ class SnapshotsSampleJsonTests(ApiSampleTestBase):
             'description': 'Default description'
         }
         subs.update(self._get_regexes())
-        return self._verify_response('snapshots-show-resp', subs,
-                                     response, 200)
+        self._verify_response('snapshots-show-resp', subs, response, 200)
 
 
 class SnapshotsSampleXmlTests(SnapshotsSampleJsonTests):
@@ -3848,8 +3775,7 @@ class VolumesSampleJsonTest(ServersSampleBase):
                                  subs_req)
         subs = self._get_regexes()
         subs.update(subs_req)
-        return self._verify_response('os-volumes-post-resp', subs,
-                                     response, 200)
+        self._verify_response('os-volumes-post-resp', subs, response, 200)
 
     def test_volumes_show(self):
         subs = {
@@ -3859,8 +3785,7 @@ class VolumesSampleJsonTest(ServersSampleBase):
         vol_id = self._get_volume_id()
         response = self._do_get('os-volumes/%s' % vol_id)
         subs.update(self._get_regexes())
-        return self._verify_response('os-volumes-get-resp', subs,
-                                     response, 200)
+        self._verify_response('os-volumes-get-resp', subs, response, 200)
 
     def test_volumes_index(self):
         subs = {
@@ -3869,8 +3794,7 @@ class VolumesSampleJsonTest(ServersSampleBase):
         }
         response = self._do_get('os-volumes')
         subs.update(self._get_regexes())
-        return self._verify_response('os-volumes-index-resp', subs,
-                                     response, 200)
+        self._verify_response('os-volumes-index-resp', subs, response, 200)
 
     def test_volumes_detail(self):
         # For now, index and detail are the same.
@@ -3881,11 +3805,10 @@ class VolumesSampleJsonTest(ServersSampleBase):
         }
         response = self._do_get('os-volumes/detail')
         subs.update(self._get_regexes())
-        return self._verify_response('os-volumes-detail-resp', subs,
-                                     response, 200)
+        self._verify_response('os-volumes-detail-resp', subs, response, 200)
 
     def test_volumes_create(self):
-        return self._post_volume()
+        self._post_volume()
 
     def test_volumes_delete(self):
         self._post_volume()
diff --git a/nova/tests/integrated/test_multiprocess_api.py b/nova/tests/integrated/test_multiprocess_api.py
index c85a43a0c..2610cdcb7 100644
--- a/nova/tests/integrated/test_multiprocess_api.py
+++ b/nova/tests/integrated/test_multiprocess_api.py
@@ -54,8 +54,8 @@ class MultiprocessWSGITest(integrated_helpers._IntegratedTestBase):
             # os._exit() which doesn't have this problem.
             status = 0
             try:
-                launcher = service.ProcessLauncher()
-                launcher.launch_server(self.osapi, workers=self.osapi.workers)
+                launcher = service.process_launcher()
+                launcher.launch_service(self.osapi, workers=self.osapi.workers)
                 launcher.wait()
             except SystemExit as exc:
                 status = exc.code
diff --git a/nova/tests/scheduler/test_filter_scheduler.py b/nova/tests/scheduler/test_filter_scheduler.py
index c8c04dc77..80680dda8 100644
--- a/nova/tests/scheduler/test_filter_scheduler.py
+++ b/nova/tests/scheduler/test_filter_scheduler.py
@@ -279,18 +279,27 @@ class FilterSchedulerTestCase(test_scheduler.SchedulerTestCase):
         self.assertEqual(2, num_attempts)
 
     def test_retry_exceeded_max_attempts(self):
-        # Test for necessary explosion when max retries is exceeded.
+        # Test for necessary explosion when max retries is exceeded and that
+        # the information needed in request_spec is still present for error
+        # handling
         self.flags(scheduler_max_attempts=2)
         sched = fakes.FakeFilterScheduler()
 
         instance_properties = {'project_id': '12345', 'os_type': 'Linux'}
-        request_spec = dict(instance_properties=instance_properties)
+        instance_uuids = ['fake-id']
+        request_spec = dict(instance_properties=instance_properties,
+                            instance_uuids=instance_uuids)
 
         retry = dict(num_attempts=2)
         filter_properties = dict(retry=retry)
 
-        self.assertRaises(exception.NoValidHost, sched._schedule, self.context,
-                request_spec, filter_properties=filter_properties)
+        self.assertRaises(exception.NoValidHost, sched.schedule_run_instance,
+                          self.context, request_spec, admin_password=None,
+                          injected_files=None, requested_networks=None,
+                          is_first_time=False,
+                          filter_properties=filter_properties)
+        uuids = request_spec.get('instance_uuids')
+        self.assertEqual(uuids, instance_uuids)
 
     def test_add_retry_host(self):
         retry = dict(num_attempts=1, hosts=[])
diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py
index 1239c4627..11165e168 100644
--- a/nova/tests/test_db_api.py
+++ b/nova/tests/test_db_api.py
@@ -27,13 +27,14 @@ import uuid as stdlib_uuid
 import mox
 from oslo.config import cfg
 from sqlalchemy.dialects import sqlite
-from sqlalchemy import MetaData
-from sqlalchemy.schema import Table
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.sql.expression import select
 
 from nova import context
 from nova import db
 from nova.db.sqlalchemy import api as sqlalchemy_api
+from nova.db.sqlalchemy import models
+from nova.db.sqlalchemy import utils as db_utils
 from nova import exception
 from nova.openstack.common.db.sqlalchemy import session as db_session
 from nova.openstack.common import timeutils
@@ -1176,6 +1177,22 @@ class DbApiTestCase(DbTestCase):
         _compare(bw_usages[2], expected_bw_usages[2])
         timeutils.clear_time_override()
 
+    def _test_decorator_wraps_helper(self, decorator):
+        def test_func():
+            """Test docstring."""
+
+        decorated_func = decorator(test_func)
+
+        self.assertEquals(test_func.func_name, decorated_func.func_name)
+        self.assertEquals(test_func.__doc__, decorated_func.__doc__)
+        self.assertEquals(test_func.__module__, decorated_func.__module__)
+
+    def test_require_context_decorator_wraps_functions_properly(self):
+        self._test_decorator_wraps_helper(sqlalchemy_api.require_context)
+
+    def test_require_admin_context_decorator_wraps_functions_properly(self):
+        self._test_decorator_wraps_helper(sqlalchemy_api.require_admin_context)
+
 
 def _get_fake_aggr_values():
     return {'name': 'fake_aggregate'}
@@ -3744,8 +3761,8 @@ class VirtualInterfaceTestCase(test.TestCase, ModelsObjectComparatorMixin):
                           self._create_virt_interface, {"uuid": vif['uuid']})
 
     def test_virtual_interface_get(self):
-        vifs = [self._create_virt_interface({'address':'a'}),
-                self._create_virt_interface({'address':'b'})]
+        vifs = [self._create_virt_interface({'address': 'a'}),
+                self._create_virt_interface({'address': 'b'})]
 
         for vif in vifs:
             real_vif = db.virtual_interface_get(self.ctxt, vif['id'])
@@ -3930,6 +3947,28 @@ class KeyPairTestCase(test.TestCase, ModelsObjectComparatorMixin):
                           param['user_id'], param['name'])
 
 
+class QuotaClassTestCase(test.TestCase, ModelsObjectComparatorMixin):
+
+    def setUp(self):
+        super(QuotaClassTestCase, self).setUp()
+        self.ctxt = context.get_admin_context()
+
+    def test_quota_class_get_default(self):
+        params = {
+            'test_resource1': '10',
+            'test_resource2': '20',
+            'test_resource3': '30',
+        }
+        for res, limit in params.items():
+            db.quota_class_create(self.ctxt, 'default', res, limit)
+
+        defaults = db.quota_class_get_default(self.ctxt)
+        self.assertEqual(defaults, dict(class_name='default',
+                                        test_resource1=10,
+                                        test_resource2=20,
+                                        test_resource3=30))
+
+
 class ArchiveTestCase(test.TestCase):
 
     def setUp(self):
@@ -3937,167 +3976,186 @@ class ArchiveTestCase(test.TestCase):
         self.context = context.get_admin_context()
         self.engine = get_engine()
         self.conn = self.engine.connect()
-        self.metadata = MetaData()
-        self.metadata.bind = self.engine
-        self.table1 = Table("instance_id_mappings",
-                           self.metadata,
-                           autoload=True)
-        self.shadow_table1 = Table("shadow_instance_id_mappings",
-                                  self.metadata,
-                                  autoload=True)
-        self.table2 = Table("dns_domains",
-                           self.metadata,
-                           autoload=True)
-        self.shadow_table2 = Table("shadow_dns_domains",
-                                  self.metadata,
-                                  autoload=True)
-        self.consoles = Table("consoles",
-                              self.metadata,
-                              autoload=True)
-        self.console_pools = Table("console_pools",
-                                   self.metadata,
-                                   autoload=True)
-        self.shadow_consoles = Table("shadow_consoles",
-                                     self.metadata,
-                                     autoload=True)
-        self.shadow_console_pools = Table("shadow_console_pools",
-                                          self.metadata,
-                                          autoload=True)
+        self.instance_id_mappings = db_utils.get_table(self.engine,
+                                                       "instance_id_mappings")
+        self.shadow_instance_id_mappings = db_utils.get_table(self.engine,
+                                                "shadow_instance_id_mappings")
+        self.dns_domains = db_utils.get_table(self.engine, "dns_domains")
+        self.shadow_dns_domains = db_utils.get_table(self.engine,
+                                                     "shadow_dns_domains")
+        self.consoles = db_utils.get_table(self.engine, "consoles")
+        self.console_pools = db_utils.get_table(self.engine, "console_pools")
+        self.shadow_consoles = db_utils.get_table(self.engine,
+                                                  "shadow_consoles")
+        self.shadow_console_pools = db_utils.get_table(self.engine,
+                                                       "shadow_console_pools")
+        self.instances = db_utils.get_table(self.engine, "instances")
+        self.shadow_instances = db_utils.get_table(self.engine,
+                                                   "shadow_instances")
         self.uuidstrs = []
         for unused in xrange(6):
             self.uuidstrs.append(stdlib_uuid.uuid4().hex)
         self.ids = []
+        self.id_tablenames_to_cleanup = set(["console_pools", "consoles"])
+        self.uuid_tablenames_to_cleanup = set(["instance_id_mappings",
+                                               "instances"])
+        self.domain_tablenames_to_cleanup = set(["dns_domains"])
 
     def tearDown(self):
         super(ArchiveTestCase, self).tearDown()
-        delete_statement1 = self.table1.delete(
-                                self.table1.c.uuid.in_(self.uuidstrs))
-        self.conn.execute(delete_statement1)
-        delete_statement2 = self.shadow_table1.delete(
-                                self.shadow_table1.c.uuid.in_(self.uuidstrs))
-        self.conn.execute(delete_statement2)
-        delete_statement3 = self.table2.delete(self.table2.c.domain.in_(
-                                               self.uuidstrs))
-        self.conn.execute(delete_statement3)
-        delete_statement4 = self.shadow_table2.delete(
-                                self.shadow_table2.c.domain.in_(self.uuidstrs))
-        self.conn.execute(delete_statement4)
-        for table in [self.console_pools, self.consoles, self.shadow_consoles,
-                      self.shadow_console_pools]:
-            delete_statement5 = table.delete(table.c.id.in_(self.ids))
-            self.conn.execute(delete_statement5)
+        for tablename in self.id_tablenames_to_cleanup:
+            for name in [tablename, "shadow_" + tablename]:
+                table = db_utils.get_table(self.engine, name)
+                del_statement = table.delete(table.c.id.in_(self.ids))
+                self.conn.execute(del_statement)
+        for tablename in self.uuid_tablenames_to_cleanup:
+            for name in [tablename, "shadow_" + tablename]:
+                table = db_utils.get_table(self.engine, name)
+                del_statement = table.delete(table.c.uuid.in_(self.uuidstrs))
+                self.conn.execute(del_statement)
+        for tablename in self.domain_tablenames_to_cleanup:
+            for name in [tablename, "shadow_" + tablename]:
+                table = db_utils.get_table(self.engine, name)
+                del_statement = table.delete(table.c.domain.in_(self.uuidstrs))
+                self.conn.execute(del_statement)
 
     def test_archive_deleted_rows(self):
         # Add 6 rows to table
         for uuidstr in self.uuidstrs:
-            insert_statement = self.table1.insert().values(uuid=uuidstr)
-            self.conn.execute(insert_statement)
+            ins_stmt = self.instance_id_mappings.insert().values(uuid=uuidstr)
+            self.conn.execute(ins_stmt)
         # Set 4 to deleted
-        update_statement = self.table1.update().\
-                where(self.table1.c.uuid.in_(self.uuidstrs[:4]))\
+        update_statement = self.instance_id_mappings.update().\
+                where(self.instance_id_mappings.c.uuid.in_(self.uuidstrs[:4]))\
                 .values(deleted=1)
         self.conn.execute(update_statement)
-        query1 = select([self.table1]).where(self.table1.c.uuid.in_(
-                                             self.uuidstrs))
-        rows1 = self.conn.execute(query1).fetchall()
+        qiim = select([self.instance_id_mappings]).where(self.
+                                instance_id_mappings.c.uuid.in_(self.uuidstrs))
+        rows = self.conn.execute(qiim).fetchall()
         # Verify we have 6 in main
-        self.assertEqual(len(rows1), 6)
-        query2 = select([self.shadow_table1]).\
-                where(self.shadow_table1.c.uuid.in_(self.uuidstrs))
-        rows2 = self.conn.execute(query2).fetchall()
+        self.assertEqual(len(rows), 6)
+        qsiim = select([self.shadow_instance_id_mappings]).\
+                where(self.shadow_instance_id_mappings.c.uuid.in_(
+                                                                self.uuidstrs))
+        rows = self.conn.execute(qsiim).fetchall()
         # Verify we have 0 in shadow
-        self.assertEqual(len(rows2), 0)
+        self.assertEqual(len(rows), 0)
         # Archive 2 rows
         db.archive_deleted_rows(self.context, max_rows=2)
-        rows3 = self.conn.execute(query1).fetchall()
+        rows = self.conn.execute(qiim).fetchall()
         # Verify we have 4 left in main
-        self.assertEqual(len(rows3), 4)
-        rows4 = self.conn.execute(query2).fetchall()
+        self.assertEqual(len(rows), 4)
+        rows = self.conn.execute(qsiim).fetchall()
         # Verify we have 2 in shadow
-        self.assertEqual(len(rows4), 2)
+        self.assertEqual(len(rows), 2)
         # Archive 2 more rows
         db.archive_deleted_rows(self.context, max_rows=2)
-        rows5 = self.conn.execute(query1).fetchall()
+        rows = self.conn.execute(qiim).fetchall()
         # Verify we have 2 left in main
-        self.assertEqual(len(rows5), 2)
-        rows6 = self.conn.execute(query2).fetchall()
+        self.assertEqual(len(rows), 2)
+        rows = self.conn.execute(qsiim).fetchall()
         # Verify we have 4 in shadow
-        self.assertEqual(len(rows6), 4)
+        self.assertEqual(len(rows), 4)
         # Try to archive more, but there are no deleted rows left.
         db.archive_deleted_rows(self.context, max_rows=2)
-        rows7 = self.conn.execute(query1).fetchall()
+        rows = self.conn.execute(qiim).fetchall()
         # Verify we still have 2 left in main
-        self.assertEqual(len(rows7), 2)
-        rows8 = self.conn.execute(query2).fetchall()
+        self.assertEqual(len(rows), 2)
+        rows = self.conn.execute(qsiim).fetchall()
         # Verify we still have 4 in shadow
-        self.assertEqual(len(rows8), 4)
-
-    def test_archive_deleted_rows_for_table(self):
-        tablename = "instance_id_mappings"
+        self.assertEqual(len(rows), 4)
+
+    def test_archive_deleted_rows_for_every_uuid_table(self):
+        tablenames = []
+        for model_class in models.__dict__.itervalues():
+            if hasattr(model_class, "__tablename__"):
+                tablenames.append(model_class.__tablename__)
+        tablenames.sort()
+        for tablename in tablenames:
+            ret = self._test_archive_deleted_rows_for_one_uuid_table(tablename)
+            if ret == 0:
+                self.uuid_tablenames_to_cleanup.add(tablename)
+
+    def _test_archive_deleted_rows_for_one_uuid_table(self, tablename):
+        """
+        :returns: 0 on success, 1 if no uuid column, 2 if insert failed
+        """
+        main_table = db_utils.get_table(self.engine, tablename)
+        if not hasattr(main_table.c, "uuid"):
+            # Not a uuid table, so skip it.
+            return 1
+        shadow_table = db_utils.get_table(self.engine, "shadow_" + tablename)
         # Add 6 rows to table
         for uuidstr in self.uuidstrs:
-            insert_statement = self.table1.insert().values(uuid=uuidstr)
-            self.conn.execute(insert_statement)
+            ins_stmt = main_table.insert().values(uuid=uuidstr)
+            try:
+                self.conn.execute(ins_stmt)
+            except IntegrityError:
+                # This table has constraints that require a table-specific
+                # insert, so skip it.
+                return 2
         # Set 4 to deleted
-        update_statement = self.table1.update().\
-                where(self.table1.c.uuid.in_(self.uuidstrs[:4]))\
+        update_statement = main_table.update().\
+                where(main_table.c.uuid.in_(self.uuidstrs[:4]))\
                 .values(deleted=1)
         self.conn.execute(update_statement)
-        query1 = select([self.table1]).where(self.table1.c.uuid.in_(
+        qmt = select([main_table]).where(main_table.c.uuid.in_(
                                              self.uuidstrs))
-        rows1 = self.conn.execute(query1).fetchall()
+        rows = self.conn.execute(qmt).fetchall()
         # Verify we have 6 in main
-        self.assertEqual(len(rows1), 6)
-        query2 = select([self.shadow_table1]).\
-                where(self.shadow_table1.c.uuid.in_(self.uuidstrs))
-        rows2 = self.conn.execute(query2).fetchall()
+        self.assertEqual(len(rows), 6)
+        qst = select([shadow_table]).\
+                where(shadow_table.c.uuid.in_(self.uuidstrs))
+        rows = self.conn.execute(qst).fetchall()
         # Verify we have 0 in shadow
-        self.assertEqual(len(rows2), 0)
+        self.assertEqual(len(rows), 0)
         # Archive 2 rows
         db.archive_deleted_rows_for_table(self.context, tablename, max_rows=2)
-        rows3 = self.conn.execute(query1).fetchall()
         # Verify we have 4 left in main
-        self.assertEqual(len(rows3), 4)
-        rows4 = self.conn.execute(query2).fetchall()
+        rows = self.conn.execute(qmt).fetchall()
+        self.assertEqual(len(rows), 4)
         # Verify we have 2 in shadow
-        self.assertEqual(len(rows4), 2)
+        rows = self.conn.execute(qst).fetchall()
+        self.assertEqual(len(rows), 2)
         # Archive 2 more rows
         db.archive_deleted_rows_for_table(self.context, tablename, max_rows=2)
-        rows5 = self.conn.execute(query1).fetchall()
         # Verify we have 2 left in main
-        self.assertEqual(len(rows5), 2)
-        rows6 = self.conn.execute(query2).fetchall()
+        rows = self.conn.execute(qmt).fetchall()
+        self.assertEqual(len(rows), 2)
         # Verify we have 4 in shadow
-        self.assertEqual(len(rows6), 4)
+        rows = self.conn.execute(qst).fetchall()
+        self.assertEqual(len(rows), 4)
         # Try to archive more, but there are no deleted rows left.
         db.archive_deleted_rows_for_table(self.context, tablename, max_rows=2)
-        rows7 = self.conn.execute(query1).fetchall()
         # Verify we still have 2 left in main
-        self.assertEqual(len(rows7), 2)
-        rows8 = self.conn.execute(query2).fetchall()
+        rows = self.conn.execute(qmt).fetchall()
+        self.assertEqual(len(rows), 2)
         # Verify we still have 4 in shadow
-        self.assertEqual(len(rows8), 4)
+        rows = self.conn.execute(qst).fetchall()
+        self.assertEqual(len(rows), 4)
+        return 0
 
     def test_archive_deleted_rows_no_id_column(self):
         uuidstr0 = self.uuidstrs[0]
-        insert_statement = self.table2.insert().values(domain=uuidstr0)
-        self.conn.execute(insert_statement)
-        update_statement = self.table2.update().\
-                           where(self.table2.c.domain == uuidstr0).\
+        ins_stmt = self.dns_domains.insert().values(domain=uuidstr0)
+        self.conn.execute(ins_stmt)
+        update_statement = self.dns_domains.update().\
+                           where(self.dns_domains.c.domain == uuidstr0).\
                            values(deleted=1)
         self.conn.execute(update_statement)
-        query1 = select([self.table2], self.table2.c.domain == uuidstr0)
-        rows1 = self.conn.execute(query1).fetchall()
-        self.assertEqual(len(rows1), 1)
-        query2 = select([self.shadow_table2],
-                        self.shadow_table2.c.domain == uuidstr0)
-        rows2 = self.conn.execute(query2).fetchall()
-        self.assertEqual(len(rows2), 0)
+        qdd = select([self.dns_domains], self.dns_domains.c.domain ==
+                                            uuidstr0)
+        rows = self.conn.execute(qdd).fetchall()
+        self.assertEqual(len(rows), 1)
+        qsdd = select([self.shadow_dns_domains],
+                        self.shadow_dns_domains.c.domain == uuidstr0)
+        rows = self.conn.execute(qsdd).fetchall()
+        self.assertEqual(len(rows), 0)
         db.archive_deleted_rows(self.context, max_rows=1)
-        rows3 = self.conn.execute(query1).fetchall()
-        self.assertEqual(len(rows3), 0)
-        rows4 = self.conn.execute(query2).fetchall()
-        self.assertEqual(len(rows4), 1)
+        rows = self.conn.execute(qdd).fetchall()
+        self.assertEqual(len(rows), 0)
+        rows = self.conn.execute(qsdd).fetchall()
+        self.assertEqual(len(rows), 1)
 
     def test_archive_deleted_rows_fk_constraint(self):
         # consoles.pool_id depends on console_pools.id
@@ -4114,13 +4172,13 @@ class ArchiveTestCase(test.TestCase):
                 self.skipTest(
                     'sqlite version too old for reliable SQLA foreign_keys')
             self.conn.execute("PRAGMA foreign_keys = ON")
-        insert_statement = self.console_pools.insert().values(deleted=1)
-        result = self.conn.execute(insert_statement)
+        ins_stmt = self.console_pools.insert().values(deleted=1)
+        result = self.conn.execute(ins_stmt)
         id1 = result.inserted_primary_key[0]
         self.ids.append(id1)
-        insert_statement = self.consoles.insert().values(deleted=1,
+        ins_stmt = self.consoles.insert().values(deleted=1,
                                                          pool_id=id1)
-        result = self.conn.execute(insert_statement)
+        result = self.conn.execute(ins_stmt)
         id2 = result.inserted_primary_key[0]
         self.ids.append(id2)
         # The first try to archive console_pools should fail, due to FK.
@@ -4132,3 +4190,69 @@ class ArchiveTestCase(test.TestCase):
         # Then archiving console_pools should work.
         num = db.archive_deleted_rows_for_table(self.context, "console_pools")
         self.assertEqual(num, 1)
+
+    def test_archive_deleted_rows_2_tables(self):
+        # Add 6 rows to each table
+        for uuidstr in self.uuidstrs:
+            ins_stmt = self.instance_id_mappings.insert().values(uuid=uuidstr)
+            self.conn.execute(ins_stmt)
+            ins_stmt2 = self.instances.insert().values(uuid=uuidstr)
+            self.conn.execute(ins_stmt2)
+        # Set 4 of each to deleted
+        update_statement = self.instance_id_mappings.update().\
+                where(self.instance_id_mappings.c.uuid.in_(self.uuidstrs[:4]))\
+                .values(deleted=1)
+        self.conn.execute(update_statement)
+        update_statement2 = self.instances.update().\
+                where(self.instances.c.uuid.in_(self.uuidstrs[:4]))\
+                .values(deleted=1)
+        self.conn.execute(update_statement2)
+        # Verify we have 6 in each main table
+        qiim = select([self.instance_id_mappings]).where(
+                         self.instance_id_mappings.c.uuid.in_(self.uuidstrs))
+        rows = self.conn.execute(qiim).fetchall()
+        self.assertEqual(len(rows), 6)
+        qi = select([self.instances]).where(self.instances.c.uuid.in_(
+                                             self.uuidstrs))
+        rows = self.conn.execute(qi).fetchall()
+        self.assertEqual(len(rows), 6)
+        # Verify we have 0 in each shadow table
+        qsiim = select([self.shadow_instance_id_mappings]).\
+                where(self.shadow_instance_id_mappings.c.uuid.in_(
+                                                            self.uuidstrs))
+        rows = self.conn.execute(qsiim).fetchall()
+        self.assertEqual(len(rows), 0)
+        qsi = select([self.shadow_instances]).\
+                where(self.shadow_instances.c.uuid.in_(self.uuidstrs))
+        rows = self.conn.execute(qsi).fetchall()
+        self.assertEqual(len(rows), 0)
+        # Archive 7 rows, which should be 4 in one table and 3 in the other.
+        db.archive_deleted_rows(self.context, max_rows=7)
+        # Verify we have 5 left in the two main tables combined
+        iim_rows = self.conn.execute(qiim).fetchall()
+        i_rows = self.conn.execute(qi).fetchall()
+        self.assertEqual(len(iim_rows) + len(i_rows), 5)
+        # Verify we have 7 in the two shadow tables combined.
+        siim_rows = self.conn.execute(qsiim).fetchall()
+        si_rows = self.conn.execute(qsi).fetchall()
+        self.assertEqual(len(siim_rows) + len(si_rows), 7)
+        # Archive the remaining deleted rows.
+        db.archive_deleted_rows(self.context, max_rows=1)
+        # Verify we have 4 total left in both main tables.
+        iim_rows = self.conn.execute(qiim).fetchall()
+        i_rows = self.conn.execute(qi).fetchall()
+        self.assertEqual(len(iim_rows) + len(i_rows), 4)
+        # Verify we have 8 in shadow
+        siim_rows = self.conn.execute(qsiim).fetchall()
+        si_rows = self.conn.execute(qsi).fetchall()
+        self.assertEqual(len(siim_rows) + len(si_rows), 8)
+        # Try to archive more, but there are no deleted rows left.
+        db.archive_deleted_rows(self.context, max_rows=500)
+        # Verify we have 4 total left in both main tables.
+        iim_rows = self.conn.execute(qiim).fetchall()
+        i_rows = self.conn.execute(qi).fetchall()
+        self.assertEqual(len(iim_rows) + len(i_rows), 4)
+        # Verify we have 8 in shadow
+        siim_rows = self.conn.execute(qsiim).fetchall()
+        si_rows = self.conn.execute(qsi).fetchall()
+        self.assertEqual(len(siim_rows) + len(si_rows), 8)
diff --git a/nova/tests/test_manager.py b/nova/tests/test_manager.py
new file mode 100644
index 000000000..7faac8608
--- /dev/null
+++ b/nova/tests/test_manager.py
@@ -0,0 +1,35 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (C) 2013, Red Hat, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""
+Unit Tests for nova.manager
+"""
+
+from nova import manager
+from nova import test
+
+
+class ManagerTestCase(test.TestCase):
+    def test_additional_apis_for_dispatcher(self):
+        class MyAPI(object):
+            pass
+
+        m = manager.Manager()
+        api = MyAPI()
+        dispatch = m.create_rpc_dispatcher(additional_apis=[api])
+
+        self.assertEqual(len(dispatch.callbacks), 3)
+        self.assertTrue(api in dispatch.callbacks)
diff --git a/nova/tests/test_migrations.py b/nova/tests/test_migrations.py
index d7ef3da2f..688db500d 100644
--- a/nova/tests/test_migrations.py
+++ b/nova/tests/test_migrations.py
@@ -1339,7 +1339,7 @@ class TestBaremetalMigrations(BaseMigrationTestCase, CommonTestsMixIn):
         super(TestBaremetalMigrations, self).__init__(*args, **kwargs)
 
         self.DEFAULT_CONFIG_FILE = os.path.join(os.path.dirname(__file__),
-                                       'test_baremetal_migrations.conf')
+                'virt/baremetal/test_baremetal_migrations.conf')
         # Test machines can set the NOVA_TEST_MIGRATIONS_CONF variable
         # to override the location of the config file for migration testing
         self.CONFIG_FILE_PATH = os.environ.get(
@@ -1425,3 +1425,8 @@ class TestBaremetalMigrations(BaseMigrationTestCase, CommonTestsMixIn):
 
         rows = ifs.select().where(ifs.c.bm_node_id == 2).execute().fetchall()
         self.assertEqual(len(rows), 0)
+
+    def _check_007(self, engine, data):
+        bm_nodes = db_utils.get_table(engine, 'bm_nodes')
+        columns = [c.name for c in bm_nodes.columns]
+        self.assertNotIn(u'prov_mac_address', columns)
diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py
index b585aede5..30f823ace 100644
--- a/nova/tests/test_quota.py
+++ b/nova/tests/test_quota.py
@@ -739,23 +739,36 @@ class DbQuotaDriverTestCase(test.TestCase):
 
     def test_get_defaults(self):
         # Use our pre-defined resources
+        self._stub_quota_class_get_default()
         result = self.driver.get_defaults(None, quota.QUOTAS._resources)
 
         self.assertEqual(result, dict(
-                instances=10,
+                instances=5,
                 cores=20,
-                ram=50 * 1024,
+                ram=25 * 1024,
                 floating_ips=10,
                 fixed_ips=10,
-                metadata_items=128,
+                metadata_items=64,
                 injected_files=5,
-                injected_file_content_bytes=10 * 1024,
+                injected_file_content_bytes=5 * 1024,
                 injected_file_path_bytes=255,
                 security_groups=10,
                 security_group_rules=20,
                 key_pairs=100,
                 ))
 
+    def _stub_quota_class_get_default(self):
+        # Stub out quota_class_get_default
+        def fake_qcgd(context):
+            self.calls.append('quota_class_get_default')
+            return dict(
+                instances=5,
+                ram=25 * 1024,
+                metadata_items=64,
+                injected_file_content_bytes=5 * 1024,
+                )
+        self.stubs.Set(db, 'quota_class_get_default', fake_qcgd)
+
     def _stub_quota_class_get_all_by_name(self):
         # Stub out quota_class_get_all_by_name
         def fake_qcgabn(context, quota_class):
@@ -831,6 +844,7 @@ class DbQuotaDriverTestCase(test.TestCase):
         self.stubs.Set(db, 'quota_usage_get_all_by_project', fake_qugabp)
 
         self._stub_quota_class_get_all_by_name()
+        self._stub_quota_class_get_default()
 
     def test_get_project_quotas(self):
         self.maxDiff = None
@@ -843,6 +857,7 @@ class DbQuotaDriverTestCase(test.TestCase):
                 'quota_get_all_by_project',
                 'quota_usage_get_all_by_project',
                 'quota_class_get_all_by_name',
+                'quota_class_get_default',
                 ])
         self.assertEqual(result, dict(
                 instances=dict(
@@ -917,10 +932,11 @@ class DbQuotaDriverTestCase(test.TestCase):
         self.assertEqual(self.calls, [
                 'quota_get_all_by_project',
                 'quota_usage_get_all_by_project',
+                'quota_class_get_default',
                 ])
         self.assertEqual(result, dict(
                 instances=dict(
-                    limit=10,
+                    limit=5,
                     in_use=2,
                     reserved=2,
                     ),
@@ -930,7 +946,7 @@ class DbQuotaDriverTestCase(test.TestCase):
                     reserved=4,
                     ),
                 ram=dict(
-                    limit=50 * 1024,
+                    limit=25 * 1024,
                     in_use=10 * 1024,
                     reserved=0,
                     ),
@@ -945,7 +961,7 @@ class DbQuotaDriverTestCase(test.TestCase):
                     reserved=0,
                     ),
                 metadata_items=dict(
-                    limit=128,
+                    limit=64,
                     in_use=0,
                     reserved=0,
                     ),
@@ -955,7 +971,7 @@ class DbQuotaDriverTestCase(test.TestCase):
                     reserved=0,
                     ),
                 injected_file_content_bytes=dict(
-                    limit=10 * 1024,
+                    limit=5 * 1024,
                     in_use=0,
                     reserved=0,
                     ),
@@ -992,6 +1008,7 @@ class DbQuotaDriverTestCase(test.TestCase):
                 'quota_get_all_by_project',
                 'quota_usage_get_all_by_project',
                 'quota_class_get_all_by_name',
+                'quota_class_get_default',
                 ])
         self.assertEqual(result, dict(
                 instances=dict(
@@ -1066,6 +1083,7 @@ class DbQuotaDriverTestCase(test.TestCase):
                 'quota_get_all_by_project',
                 'quota_usage_get_all_by_project',
                 'quota_class_get_all_by_name',
+                'quota_class_get_default',
                 ])
         self.assertEqual(result, dict(
                 cores=dict(
@@ -1094,6 +1112,7 @@ class DbQuotaDriverTestCase(test.TestCase):
         self.assertEqual(self.calls, [
                 'quota_get_all_by_project',
                 'quota_class_get_all_by_name',
+                'quota_class_get_default',
                 ])
         self.assertEqual(result, dict(
                 instances=dict(
diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py
index 2cbc82fda..3ca6d7bc1 100644
--- a/nova/tests/test_service.py
+++ b/nova/tests/test_service.py
@@ -201,7 +201,6 @@ class TestLauncher(test.TestCase):
         self.service = service.WSGIService("test_service")
 
     def test_launch_app(self):
-        launcher = service.Launcher()
-        launcher.launch_server(self.service)
+        service.serve(self.service)
         self.assertNotEquals(0, self.service.port)
-        launcher.stop()
+        service._launcher.stop()
diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py
index 39db03f3e..a2abedda8 100644
--- a/nova/tests/test_utils.py
+++ b/nova/tests/test_utils.py
@@ -360,19 +360,6 @@ class GenericUtilsTestCase(test.TestCase):
         h2 = hashlib.sha1(data).hexdigest()
         self.assertEquals(h1, h2)
 
-    def test_is_valid_boolstr(self):
-        self.assertTrue(utils.is_valid_boolstr('true'))
-        self.assertTrue(utils.is_valid_boolstr('false'))
-        self.assertTrue(utils.is_valid_boolstr('yes'))
-        self.assertTrue(utils.is_valid_boolstr('no'))
-        self.assertTrue(utils.is_valid_boolstr('y'))
-        self.assertTrue(utils.is_valid_boolstr('n'))
-        self.assertTrue(utils.is_valid_boolstr('1'))
-        self.assertTrue(utils.is_valid_boolstr('0'))
-
-        self.assertFalse(utils.is_valid_boolstr('maybe'))
-        self.assertFalse(utils.is_valid_boolstr('only on tuesdays'))
-
     def test_is_valid_ipv4(self):
         self.assertTrue(utils.is_valid_ipv4('127.0.0.1'))
         self.assertFalse(utils.is_valid_ipv4('::1'))
diff --git a/nova/tests/test_virt_drivers.py b/nova/tests/test_virt_drivers.py
index 395663600..c054b9624 100644
--- a/nova/tests/test_virt_drivers.py
+++ b/nova/tests/test_virt_drivers.py
@@ -25,9 +25,9 @@ from nova import exception
 from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
 from nova import test
-from nova.tests import fake_libvirt_utils
 from nova.tests.image import fake as fake_image
 from nova.tests import utils as test_utils
+from nova.tests.virt.libvirt import fake_libvirt_utils
 from nova.virt import event as virtevent
 from nova.virt import fake
 
@@ -67,9 +67,9 @@ class _FakeDriverBackendTestCase(object):
         else:
             self.saved_libvirt = None
 
-        import nova.tests.fake_imagebackend as fake_imagebackend
-        import nova.tests.fake_libvirt_utils as fake_libvirt_utils
-        import nova.tests.fakelibvirt as fakelibvirt
+        import nova.tests.virt.libvirt.fake_imagebackend as fake_imagebackend
+        import nova.tests.virt.libvirt.fake_libvirt_utils as fake_libvirt_utils
+        import nova.tests.virt.libvirt.fakelibvirt as fakelibvirt
 
         sys.modules['libvirt'] = fakelibvirt
         import nova.virt.libvirt.driver
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 45ebfaab3..2628f2582 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -2117,8 +2117,9 @@ class XenAPIBWCountersTestCase(stubs.XenAPITestBase):
 
 
 # TODO(salvatore-orlando): this class and
-# nova.tests.test_libvirt.IPTablesFirewallDriverTestCase share a lot of code.
-# Consider abstracting common code in a base class for firewall driver testing.
+# nova.tests.virt.test_libvirt.IPTablesFirewallDriverTestCase share a lot of
+# code.  Consider abstracting common code in a base class for firewall driver
+# testing.
 class XenAPIDom0IptablesFirewallTestCase(stubs.XenAPITestBase):
 
     _in_rules = [
diff --git a/nova/tests/baremetal/__init__.py b/nova/tests/virt/baremetal/__init__.py
index f15d84efc..34b09daac 100644
--- a/nova/tests/baremetal/__init__.py
+++ b/nova/tests/virt/baremetal/__init__.py
@@ -12,4 +12,4 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-from nova.tests.baremetal import *
+from nova.tests.virt.baremetal import *
diff --git a/nova/tests/baremetal/db/__init__.py b/nova/tests/virt/baremetal/db/__init__.py
index 543dfc1ae..0f1f4e846 100644
--- a/nova/tests/baremetal/db/__init__.py
+++ b/nova/tests/virt/baremetal/db/__init__.py
@@ -12,4 +12,4 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-from nova.tests.baremetal.db import *
+from nova.tests.virt.baremetal.db import *
diff --git a/nova/tests/baremetal/db/base.py b/nova/tests/virt/baremetal/db/base.py
index 499eee32a..499eee32a 100644
--- a/nova/tests/baremetal/db/base.py
+++ b/nova/tests/virt/baremetal/db/base.py
diff --git a/nova/tests/baremetal/db/test_bm_interface.py b/nova/tests/virt/baremetal/db/test_bm_interface.py
index e870ec5e0..24b6ae1e1 100644
--- a/nova/tests/baremetal/db/test_bm_interface.py
+++ b/nova/tests/virt/baremetal/db/test_bm_interface.py
@@ -19,7 +19,7 @@ Bare-metal DB testcase for BareMetalInterface
 
 from nova import exception
 from nova.openstack.common.db import exception as db_exc
-from nova.tests.baremetal.db import base
+from nova.tests.virt.baremetal.db import base
 from nova.virt.baremetal import db
 
 
diff --git a/nova/tests/baremetal/db/test_bm_node.py b/nova/tests/virt/baremetal/db/test_bm_node.py
index 204a6bf7b..0acd5a994 100644
--- a/nova/tests/baremetal/db/test_bm_node.py
+++ b/nova/tests/virt/baremetal/db/test_bm_node.py
@@ -18,8 +18,8 @@ Bare-Metal DB testcase for BareMetalNode
 """
 
 from nova import exception
-from nova.tests.baremetal.db import base
-from nova.tests.baremetal.db import utils
+from nova.tests.virt.baremetal.db import base
+from nova.tests.virt.baremetal.db import utils
 from nova.virt.baremetal import db
 
 
diff --git a/nova/tests/baremetal/db/test_bm_pxe_ip.py b/nova/tests/virt/baremetal/db/test_bm_pxe_ip.py
index fe8ba5b3e..85f3e2f4b 100644
--- a/nova/tests/baremetal/db/test_bm_pxe_ip.py
+++ b/nova/tests/virt/baremetal/db/test_bm_pxe_ip.py
@@ -19,8 +19,8 @@ Bare-metal DB testcase for BareMetalPxeIp
 
 from nova import exception
 from nova.openstack.common.db import exception as db_exc
-from nova.tests.baremetal.db import base
-from nova.tests.baremetal.db import utils
+from nova.tests.virt.baremetal.db import base
+from nova.tests.virt.baremetal.db import utils
 from nova.virt.baremetal import db
 
 
diff --git a/nova/tests/baremetal/db/utils.py b/nova/tests/virt/baremetal/db/utils.py
index f50abd2e6..c3b3cff5f 100644
--- a/nova/tests/baremetal/db/utils.py
+++ b/nova/tests/virt/baremetal/db/utils.py
@@ -31,7 +31,6 @@ def new_bm_node(**kwargs):
     h.pm_address = kwargs.pop('pm_address', '192.168.1.1')
     h.pm_user = kwargs.pop('pm_user', 'ipmi_user')
     h.pm_password = kwargs.pop('pm_password', 'ipmi_password')
-    h.prov_mac_address = kwargs.pop('prov_mac_address', '12:34:56:78:90:ab')
     h.task_state = kwargs.pop('task_state', None)
     h.terminal_port = kwargs.pop('terminal_port', 8000)
     if len(kwargs) > 0:
diff --git a/nova/tests/test_baremetal_migrations.conf b/nova/tests/virt/baremetal/test_baremetal_migrations.conf
index 774f14994..774f14994 100644
--- a/nova/tests/test_baremetal_migrations.conf
+++ b/nova/tests/virt/baremetal/test_baremetal_migrations.conf
diff --git a/nova/tests/baremetal/test_driver.py b/nova/tests/virt/baremetal/test_driver.py
index 3b0295a92..0564faf1e 100644
--- a/nova/tests/baremetal/test_driver.py
+++ b/nova/tests/virt/baremetal/test_driver.py
@@ -25,10 +25,10 @@ from oslo.config import cfg
 from nova.compute import power_state
 from nova import exception
 from nova import test
-from nova.tests.baremetal.db import base as bm_db_base
-from nova.tests.baremetal.db import utils as bm_db_utils
 from nova.tests.image import fake as fake_image
 from nova.tests import utils
+from nova.tests.virt.baremetal.db import base as bm_db_base
+from nova.tests.virt.baremetal.db import utils as bm_db_utils
 from nova.virt.baremetal import baremetal_states
 from nova.virt.baremetal import db
 from nova.virt.baremetal import driver as bm_driver
diff --git a/nova/tests/baremetal/test_ipmi.py b/nova/tests/virt/baremetal/test_ipmi.py
index 01bb58d8b..ba7a875cf 100644
--- a/nova/tests/baremetal/test_ipmi.py
+++ b/nova/tests/virt/baremetal/test_ipmi.py
@@ -26,7 +26,7 @@ import tempfile
 from oslo.config import cfg
 
 from nova import test
-from nova.tests.baremetal.db import utils as bm_db_utils
+from nova.tests.virt.baremetal.db import utils as bm_db_utils
 from nova import utils
 from nova.virt.baremetal import baremetal_states
 from nova.virt.baremetal import ipmi
diff --git a/nova/tests/baremetal/test_nova_baremetal_deploy_helper.py b/nova/tests/virt/baremetal/test_nova_baremetal_deploy_helper.py
index 42ee6c8e4..28f40bcf9 100644
--- a/nova/tests/baremetal/test_nova_baremetal_deploy_helper.py
+++ b/nova/tests/virt/baremetal/test_nova_baremetal_deploy_helper.py
@@ -25,7 +25,7 @@ import mox
 from nova.cmd import baremetal_deploy_helper as bmdh
 from nova.openstack.common import log as logging
 from nova import test
-from nova.tests.baremetal.db import base as bm_db_base
+from nova.tests.virt.baremetal.db import base as bm_db_base
 from nova.virt.baremetal import db as bm_db
 
 bmdh.LOG = logging.getLogger('nova.virt.baremetal.deploy_helper')
diff --git a/nova/tests/baremetal/test_nova_baremetal_manage.py b/nova/tests/virt/baremetal/test_nova_baremetal_manage.py
index 6be63aac2..6651e6ad4 100644
--- a/nova/tests/baremetal/test_nova_baremetal_manage.py
+++ b/nova/tests/virt/baremetal/test_nova_baremetal_manage.py
@@ -17,7 +17,7 @@
 #    under the License.
 
 from nova.cmd import baremetal_manage as bm_man
-from nova.tests.baremetal.db import base as bm_db_base
+from nova.tests.virt.baremetal.db import base as bm_db_base
 
 
 class BareMetalDbCommandsTestCase(bm_db_base.BMDBTestCase):
diff --git a/nova/tests/baremetal/test_pxe.py b/nova/tests/virt/baremetal/test_pxe.py
index 50fe16715..022f9c692 100644
--- a/nova/tests/baremetal/test_pxe.py
+++ b/nova/tests/virt/baremetal/test_pxe.py
@@ -28,10 +28,10 @@ from testtools import matchers
 
 from nova import exception
 from nova.openstack.common.db import exception as db_exc
-from nova.tests.baremetal.db import base as bm_db_base
-from nova.tests.baremetal.db import utils as bm_db_utils
 from nova.tests.image import fake as fake_image
 from nova.tests import utils
+from nova.tests.virt.baremetal.db import base as bm_db_base
+from nova.tests.virt.baremetal.db import utils as bm_db_utils
 from nova.virt.baremetal import baremetal_states
 from nova.virt.baremetal import db
 from nova.virt.baremetal import pxe
@@ -74,7 +74,6 @@ class BareMetalPXETestCase(bm_db_base.BMDBTestCase):
                 service_host='test_host',
                 cpus=4,
                 memory_mb=2048,
-                prov_mac_address='11:11:11:11:11:11',
             )
         self.nic_info = [
                 {'address': '22:22:22:22:22:22', 'datapath_id': '0x1',
diff --git a/nova/tests/baremetal/test_tilera.py b/nova/tests/virt/baremetal/test_tilera.py
index f92e9b270..488cba4df 100755
--- a/nova/tests/baremetal/test_tilera.py
+++ b/nova/tests/virt/baremetal/test_tilera.py
@@ -24,10 +24,10 @@ from oslo.config import cfg
 
 from nova import exception
 from nova.openstack.common.db import exception as db_exc
-from nova.tests.baremetal.db import base as bm_db_base
-from nova.tests.baremetal.db import utils as bm_db_utils
 from nova.tests.image import fake as fake_image
 from nova.tests import utils
+from nova.tests.virt.baremetal.db import base as bm_db_base
+from nova.tests.virt.baremetal.db import utils as bm_db_utils
 from nova.virt.baremetal import baremetal_states
 from nova.virt.baremetal import db
 from nova.virt.baremetal import tilera
@@ -70,7 +70,6 @@ class BareMetalTileraTestCase(bm_db_base.BMDBTestCase):
                 service_host='test_host',
                 cpus=4,
                 memory_mb=2048,
-                prov_mac_address='11:11:11:11:11:11',
             )
         self.nic_info = [
                 {'address': '22:22:22:22:22:22', 'datapath_id': '0x1',
diff --git a/nova/tests/baremetal/test_tilera_pdu.py b/nova/tests/virt/baremetal/test_tilera_pdu.py
index fee5bc49e..95d840574 100755
--- a/nova/tests/baremetal/test_tilera_pdu.py
+++ b/nova/tests/virt/baremetal/test_tilera_pdu.py
@@ -21,7 +21,7 @@
 from oslo.config import cfg
 
 from nova import test
-from nova.tests.baremetal.db import utils as bm_db_utils
+from nova.tests.virt.baremetal.db import utils as bm_db_utils
 from nova import utils
 from nova.virt.baremetal import baremetal_states
 from nova.virt.baremetal import tilera_pdu
diff --git a/nova/tests/baremetal/test_utils.py b/nova/tests/virt/baremetal/test_utils.py
index df5112deb..df5112deb 100644
--- a/nova/tests/baremetal/test_utils.py
+++ b/nova/tests/virt/baremetal/test_utils.py
diff --git a/nova/tests/baremetal/test_virtual_power_driver.py b/nova/tests/virt/baremetal/test_virtual_power_driver.py
index d6d615194..58a1e4f08 100644
--- a/nova/tests/baremetal/test_virtual_power_driver.py
+++ b/nova/tests/virt/baremetal/test_virtual_power_driver.py
@@ -23,10 +23,10 @@ from oslo.config import cfg
 
 from nova import exception
 from nova.openstack.common import processutils
-from nova.tests.baremetal.db import base as bm_db_base
-from nova.tests.baremetal.db import utils as bm_db_utils
 from nova.tests.image import fake as fake_image
 from nova.tests import utils
+from nova.tests.virt.baremetal.db import base as bm_db_base
+from nova.tests.virt.baremetal.db import utils as bm_db_utils
 from nova.virt.baremetal import db
 from nova.virt.baremetal import virtual_power_driver
 import nova.virt.powervm.common as connection
@@ -71,7 +71,6 @@ class BareMetalVPDTestCase(bm_db_base.BMDBTestCase):
                 service_host='test_host',
                 cpus=2,
                 memory_mb=2048,
-                prov_mac_address='aa:bb:cc:dd:ee:ff',
             )
         self.nic_info = [
                 {'address': '11:11:11:11:11:11', 'datapath_id': '0x1',
@@ -200,9 +199,7 @@ class VPDClassMethodsTestCase(BareMetalVPDTestCase):
 
         self.mox.StubOutWithMock(self.pm, '_run_command')
         cmd = self.pm._vp_cmd.get_node_macs.replace('{_NodeName_}', 'testNode')
-        # aa:bb:cc:dd:ee:ff is prov_mac_adress. Check it is not used to
-        # find the node.
-        self.pm._run_command(cmd).AndReturn(["aabbccddeeff", "ffeeddccbbaa"])
+        self.pm._run_command(cmd).AndReturn(["ffeeddccbbaa"])
 
         self.mox.ReplayAll()
         name = self.pm._check_for_node()
diff --git a/nova/tests/baremetal/test_volume_driver.py b/nova/tests/virt/baremetal/test_volume_driver.py
index 24dadac94..24dadac94 100644
--- a/nova/tests/baremetal/test_volume_driver.py
+++ b/nova/tests/virt/baremetal/test_volume_driver.py
diff --git a/nova/tests/virt/libvirt/__init__.py b/nova/tests/virt/libvirt/__init__.py
new file mode 100644
index 000000000..a02a20177
--- /dev/null
+++ b/nova/tests/virt/libvirt/__init__.py
@@ -0,0 +1,15 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (c) 2013 OpenStack Foundation
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
diff --git a/nova/tests/fake_imagebackend.py b/nova/tests/virt/libvirt/fake_imagebackend.py
index 48426505e..48426505e 100644
--- a/nova/tests/fake_imagebackend.py
+++ b/nova/tests/virt/libvirt/fake_imagebackend.py
diff --git a/nova/tests/fake_libvirt_utils.py b/nova/tests/virt/libvirt/fake_libvirt_utils.py
index ba00a7091..ba00a7091 100644
--- a/nova/tests/fake_libvirt_utils.py
+++ b/nova/tests/virt/libvirt/fake_libvirt_utils.py
diff --git a/nova/tests/fakelibvirt.py b/nova/tests/virt/libvirt/fakelibvirt.py
index 30c3e4d9c..30c3e4d9c 100644
--- a/nova/tests/fakelibvirt.py
+++ b/nova/tests/virt/libvirt/fakelibvirt.py
diff --git a/nova/tests/test_fakelibvirt.py b/nova/tests/virt/libvirt/test_fakelibvirt.py
index ee2008544..52183ab5f 100644
--- a/nova/tests/test_fakelibvirt.py
+++ b/nova/tests/virt/libvirt/test_fakelibvirt.py
@@ -18,7 +18,7 @@ from nova import test
 
 from lxml import etree
 
-import nova.tests.fakelibvirt as libvirt
+import nova.tests.virt.libvirt.fakelibvirt as libvirt
 
 
 def get_vm_xml(name="testname", uuid=None, source_type='file',
diff --git a/nova/tests/test_imagebackend.py b/nova/tests/virt/libvirt/test_imagebackend.py
index b5d64a218..6548ab76c 100644
--- a/nova/tests/test_imagebackend.py
+++ b/nova/tests/virt/libvirt/test_imagebackend.py
@@ -23,8 +23,8 @@ from oslo.config import cfg
 from nova import exception
 from nova.openstack.common import uuidutils
 from nova import test
-from nova.tests import fake_libvirt_utils
 from nova.tests import fake_processutils
+from nova.tests.virt.libvirt import fake_libvirt_utils
 from nova.virt.libvirt import imagebackend
 
 CONF = cfg.CONF
diff --git a/nova/tests/test_imagecache.py b/nova/tests/virt/libvirt/test_imagecache.py
index 256732ace..bdc895474 100644
--- a/nova/tests/test_imagecache.py
+++ b/nova/tests/virt/libvirt/test_imagecache.py
@@ -945,7 +945,7 @@ class ImageCacheManagerTestCase(test.TestCase):
     def test_compute_manager(self):
         was = {'called': False}
 
-        def fake_get_all(context, *args, **kwargs):
+        def fake_get_all_by_filters(context, *args, **kwargs):
             was['called'] = True
             return [{'image_ref': '1',
                      'host': CONF.host,
@@ -963,7 +963,8 @@ class ImageCacheManagerTestCase(test.TestCase):
         with utils.tempdir() as tmpdir:
             self.flags(instances_path=tmpdir)
 
-            self.stubs.Set(db, 'instance_get_all', fake_get_all)
+            self.stubs.Set(db, 'instance_get_all_by_filters',
+                           fake_get_all_by_filters)
             compute = importutils.import_object(CONF.compute_manager)
             self.flags(use_local=True, group='conductor')
             compute.conductor_api = conductor.API()
diff --git a/nova/tests/test_libvirt.py b/nova/tests/virt/libvirt/test_libvirt.py
index 6d8332769..f72c37cd1 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/virt/libvirt/test_libvirt.py
@@ -45,10 +45,10 @@ from nova.openstack.common import jsonutils
 from nova.openstack.common import loopingcall
 from nova.openstack.common import uuidutils
 from nova import test
-from nova.tests import fake_libvirt_utils
 from nova.tests import fake_network
 import nova.tests.image.fake
 from nova.tests import matchers
+from nova.tests.virt.libvirt import fake_libvirt_utils
 from nova import utils
 from nova import version
 from nova.virt.disk import api as disk
@@ -68,7 +68,7 @@ from nova.virt import netutils
 try:
     import libvirt
 except ImportError:
-    import nova.tests.fakelibvirt as libvirt
+    import nova.tests.virt.libvirt.fakelibvirt as libvirt
 libvirt_driver.libvirt = libvirt
 
 
@@ -351,7 +351,8 @@ class LibvirtConnTestCase(test.TestCase):
                 return FakeVirtDomain()
 
         # Creating mocks
-        volume_driver = 'iscsi=nova.tests.test_libvirt.FakeVolumeDriver'
+        volume_driver = ('iscsi=nova.tests.virt.libvirt.test_libvirt'
+                         '.FakeVolumeDriver')
         self.flags(libvirt_volume_drivers=[volume_driver])
         fake = FakeLibvirtDriver()
         # Customizing above fake if necessary
@@ -3175,13 +3176,13 @@ class LibvirtConnTestCase(test.TestCase):
         fake_disks = {'fake1': [{'type': 'qcow2', 'path': '/somepath/disk1',
                                  'virt_disk_size': '10737418240',
                                  'backing_file': '/somepath/disk1',
-                                 'disk_size':'83886080',
-                                 'over_committed_disk_size':'10653532160'}],
+                                 'disk_size': '83886080',
+                                 'over_committed_disk_size': '10653532160'}],
                       'fake2': [{'type': 'raw', 'path': '/somepath/disk2',
                                  'virt_disk_size': '0',
                                  'backing_file': '/somepath/disk2',
-                                 'disk_size':'10737418240',
-                                 'over_committed_disk_size':'0'}]}
+                                 'disk_size': '10737418240',
+                                 'over_committed_disk_size': '0'}]}
 
         def get_info(instance_name):
             return jsonutils.dumps(fake_disks.get(instance_name))
diff --git a/nova/tests/test_libvirt_blockinfo.py b/nova/tests/virt/libvirt/test_libvirt_blockinfo.py
index aae5bec58..aae5bec58 100644
--- a/nova/tests/test_libvirt_blockinfo.py
+++ b/nova/tests/virt/libvirt/test_libvirt_blockinfo.py
diff --git a/nova/tests/test_libvirt_config.py b/nova/tests/virt/libvirt/test_libvirt_config.py
index 8eed7136e..8eed7136e 100644
--- a/nova/tests/test_libvirt_config.py
+++ b/nova/tests/virt/libvirt/test_libvirt_config.py
diff --git a/nova/tests/test_libvirt_utils.py b/nova/tests/virt/libvirt/test_libvirt_utils.py
index 60f0682a8..60f0682a8 100644
--- a/nova/tests/test_libvirt_utils.py
+++ b/nova/tests/virt/libvirt/test_libvirt_utils.py
diff --git a/nova/tests/test_libvirt_vif.py b/nova/tests/virt/libvirt/test_libvirt_vif.py
index 0b661d147..c9c6aef12 100644
--- a/nova/tests/test_libvirt_vif.py
+++ b/nova/tests/virt/libvirt/test_libvirt_vif.py
@@ -20,7 +20,7 @@ from oslo.config import cfg
 from nova import exception
 from nova.network import model as network_model
 from nova import test
-from nova.tests import fakelibvirt
+from nova.tests.virt.libvirt import fakelibvirt
 from nova import utils
 from nova.virt.libvirt import config as vconfig
 from nova.virt.libvirt import vif
diff --git a/nova/tests/test_libvirt_volume.py b/nova/tests/virt/libvirt/test_libvirt_volume.py
index 6d2dc9dce..86773dd10 100644
--- a/nova/tests/test_libvirt_volume.py
+++ b/nova/tests/virt/libvirt/test_libvirt_volume.py
@@ -23,7 +23,7 @@ from oslo.config import cfg
 from nova import exception
 from nova.storage import linuxscsi
 from nova import test
-from nova.tests import fake_libvirt_utils
+from nova.tests.virt.libvirt import fake_libvirt_utils
 from nova import utils
 from nova.virt import fake
 from nova.virt.libvirt import utils as libvirt_utils
diff --git a/nova/tests/virt/powervm/__init__.py b/nova/tests/virt/powervm/__init__.py
new file mode 100644
index 000000000..d5d002224
--- /dev/null
+++ b/nova/tests/virt/powervm/__init__.py
@@ -0,0 +1,16 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2013 OpenStack Foundation
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
diff --git a/nova/tests/test_powervm.py b/nova/tests/virt/powervm/test_powervm.py
index 8d22a296a..8d22a296a 100644
--- a/nova/tests/test_powervm.py
+++ b/nova/tests/virt/powervm/test_powervm.py
diff --git a/nova/utils.py b/nova/utils.py
index 3020781c8..3e9d8c597 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -605,12 +605,6 @@ def is_int_like(val):
         return False
 
 
-def is_valid_boolstr(val):
-    """Check if the provided string is a valid bool string or not."""
-    boolstrs = ('true', 'false', 'yes', 'no', 'y', 'n', '1', '0')
-    return str(val).lower() in boolstrs
-
-
 def is_valid_ipv4(address):
     """Verify that address represents a valid IPv4 address."""
     try:
diff --git a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/007_drop_prov_mac_address.py b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/007_drop_prov_mac_address.py
new file mode 100644
index 000000000..eb6ae756c
--- /dev/null
+++ b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/007_drop_prov_mac_address.py
@@ -0,0 +1,36 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (c) 2013 NTT DOCOMO, INC.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from sqlalchemy import Column, MetaData, String, Table
+
+
+def upgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+    nodes = Table('bm_nodes', meta, autoload=True)
+    nodes.drop_column('prov_mac_address')
+
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+    nodes = Table('bm_nodes', meta, autoload=True)
+    nodes.create_column(Column('prov_mac_address', String(length=255)))
+
+    # NOTE(arata): The values held by prov_mac_address are lost in upgrade.
+    # So downgrade has no other choice but to set the column to NULL.
diff --git a/nova/virt/baremetal/db/sqlalchemy/models.py b/nova/virt/baremetal/db/sqlalchemy/models.py
index 61063f031..dbc9386ec 100644
--- a/nova/virt/baremetal/db/sqlalchemy/models.py
+++ b/nova/virt/baremetal/db/sqlalchemy/models.py
@@ -45,7 +45,6 @@ class BareMetalNode(BASE, models.NovaBase):
     pm_address = Column(Text)
     pm_user = Column(Text)
     pm_password = Column(Text)
-    prov_mac_address = Column(Text)
     task_state = Column(String(255))
     terminal_port = Column(Integer)
     image_path = Column(String(255), nullable=True)
diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py
index 2c5def493..c20f2c71a 100755
--- a/nova/virt/disk/api.py
+++ b/nova/virt/disk/api.py
@@ -131,7 +131,8 @@ def can_resize_fs(image, size, use_cow=False):
     """Check whether we can resize contained file system."""
 
     LOG.debug(_('Checking if we can resize image %(image)s. '
-                'size=%(size)s, CoW=%(use_cow)s'), locals())
+                'size=%(size)s, CoW=%(use_cow)s'),
+              {'image': image, 'size': size, 'use_cow': use_cow})
 
     # Check that we're increasing the size
     virt_size = get_disk_size(image)
@@ -281,9 +282,10 @@ def inject_data(image, key=None, net=None, metadata=None, admin_password=None,
     Raises an exception if a mandatory item can't be injected.
     """
     LOG.debug(_("Inject data image=%(image)s key=%(key)s net=%(net)s "
-                "metadata=%(metadata)s admin_password=ha-ha-not-telling-you "
-                "files=%(files)s partition=%(partition)s use_cow=%(use_cow)s")
-              % locals())
+                "metadata=%(metadata)s admin_password=<SANITIZED> "
+                "files=%(files)s partition=%(partition)s use_cow=%(use_cow)s"),
+              {'image': image, 'key': key, 'net': net, 'metadata': metadata,
+               'files': files, 'partition': partition, 'use_cow': use_cow})
     fmt = "raw"
     if use_cow:
         fmt = "qcow2"
@@ -298,7 +300,7 @@ def inject_data(image, key=None, net=None, metadata=None, admin_password=None,
             if inject_val:
                 raise
         LOG.warn(_('Ignoring error injecting data into image '
-                   '(%(e)s)') % locals())
+                   '(%(e)s)'), {'e': e})
         return False
 
     try:
@@ -317,7 +319,7 @@ def setup_container(image, container_dir, use_cow=False):
     img = _DiskImage(image=image, use_cow=use_cow, mount_dir=container_dir)
     if not img.mount():
         LOG.error(_("Failed to mount container filesystem '%(image)s' "
-                    "on '%(target)s': %(errors)s") %
+                    "on '%(target)s': %(errors)s"),
                   {"image": img, "target": container_dir,
                    "errors": img.errors})
         raise exception.NovaException(img.errors)
@@ -372,7 +374,7 @@ def inject_data_into_fs(fs, key, net, metadata, admin_password, files,
                 if inject in mandatory:
                     raise
                 LOG.warn(_('Ignoring error injecting %(inject)s into image '
-                           '(%(e)s)') % locals())
+                           '(%(e)s)'), {'e': e})
                 status = False
     return status
 
@@ -383,8 +385,8 @@ def _inject_files_into_fs(files, fs):
 
 
 def _inject_file_into_fs(fs, path, contents, append=False):
-    LOG.debug(_("Inject file fs=%(fs)s path=%(path)s append=%(append)s") %
-              locals())
+    LOG.debug(_("Inject file fs=%(fs)s path=%(path)s append=%(append)s"),
+              {'fs': fs, 'path': path, 'append': append})
     if append:
         fs.append_file(path, contents)
     else:
@@ -392,8 +394,8 @@ def _inject_file_into_fs(fs, path, contents, append=False):
 
 
 def _inject_metadata_into_fs(metadata, fs):
-    LOG.debug(_("Inject metadata fs=%(fs)s metadata=%(metadata)s") %
-              locals())
+    LOG.debug(_("Inject metadata fs=%(fs)s metadata=%(metadata)s"),
+              {'fs': fs, 'metadata': metadata})
     metadata = dict([(m['key'], m['value']) for m in metadata])
     _inject_file_into_fs(fs, 'meta.js', jsonutils.dumps(metadata))
 
@@ -433,8 +435,7 @@ def _inject_key_into_fs(key, fs):
     fs is the path to the base of the filesystem into which to inject the key.
     """
 
-    LOG.debug(_("Inject key fs=%(fs)s key=%(key)s") %
-              locals())
+    LOG.debug(_("Inject key fs=%(fs)s key=%(key)s"), {'fs': fs, 'key': key})
     sshdir = os.path.join('root', '.ssh')
     fs.make_path(sshdir)
     fs.set_ownership(sshdir, "root", "root")
@@ -462,8 +463,7 @@ def _inject_net_into_fs(net, fs):
     net is the contents of /etc/network/interfaces.
     """
 
-    LOG.debug(_("Inject key fs=%(fs)s net=%(net)s") %
-              locals())
+    LOG.debug(_("Inject key fs=%(fs)s net=%(net)s"), {'fs': fs, 'net': net})
     netdir = os.path.join('etc', 'network')
     fs.make_path(netdir)
     fs.set_ownership(netdir, "root", "root")
@@ -489,8 +489,7 @@ def _inject_admin_password_into_fs(admin_passwd, fs):
     # necessary changes, and then copy them back.
 
     LOG.debug(_("Inject admin password fs=%(fs)s "
-                "admin_passwd=ha-ha-not-telling-you") %
-              locals())
+                "admin_passwd=<SANITIZED>"), {'fs': fs})
     admin_user = 'root'
 
     fd, tmp_passwd = tempfile.mkstemp()